summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-10-18 18:43:14 +0100
committerV3n3RiX <venerix@rogentos.ro>2016-10-18 18:43:14 +0100
commit776c6d8125820d0c281a4dc1027b35bfe6f9af3d (patch)
tree28819247cc91a6e0979d2c0d8318e238aa6f424b
parentc37d43c2fb1513188a1cdc6f4124d093ccf7c333 (diff)
do not create a system initramfs anymore, we rely on kernel and dracut to handle it
-rwxr-xr-xlibkvasile8
-rwxr-xr-xmakeiso4
2 files changed, 1 insertions, 11 deletions
diff --git a/libkvasile b/libkvasile
index e938d2b..5d7988a 100755
--- a/libkvasile
+++ b/libkvasile
@@ -8,7 +8,7 @@ source /lib/gentoo/functions.sh
export local releasename="kogaion"
export local releasetarget="desktop"
export local releaseversion="3"
-export local kernelver="4.4.5-"$releasename""
+export local kernelver="4.4.10-"$releasename""
export local chrootx64=""$releasename"_"$releaseversion"_core_x64.squashfs"
export local chrootx64md5=""$chrootx64".md5"
@@ -50,8 +50,6 @@ export local isoliveosdir=""$isorootdir"/LiveOS"
export local isosyncdir=""$isorootdir"/rootfs"
export local isobootdir=""$isorootdir"/boot/grub"
export local isoefibootdir=""$isorootdir"/efi/boot"
-export local dracutrd="initramfs-genkernel-"$isomainarch"-"$kernelver""
-export local dracutcmd="dracut -N -o systemd -o systemd-initrd -o systemd-networkd -o dracut-systemd --force --kver "$kernelver" "/boot/"$dracutrd"""
# generic functions (used for both build && iso creation)
@@ -212,10 +210,6 @@ isoramfs () {
chroot "$isosyncdir" su - "$isouser" -c "$isodracutcmd"
}
-systemramfs () {
- chroot "$isosyncdir" su - "$isouser" -c "$dracutcmd"
-}
-
isoefiimg () {
chroot "$isosyncdir" su - "$isouser" -c "$isoeficmd"
}
diff --git a/makeiso b/makeiso
index 8c8cbe4..e6ef8dc 100755
--- a/makeiso
+++ b/makeiso
@@ -23,10 +23,6 @@ prepareiso () {
isostart
isoramfs
isostop
- # generate system initramfs
- isostart
- systemramfs
- isostop
# copy live initramfs into cdroot
mv ""$isosyncdir"/boot/"$isodracutrd"" ""$isorootdir"/boot/initrd"
# generate live efi image