diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-23 17:28:30 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-23 17:28:30 +0000 |
| commit | 5ebe15d1c7588ac5784a874d68cdb556bff776a6 (patch) | |
| tree | 51fcc11753e646382c8f4d2a5c450153e86c8ca9 | |
| parent | b39fec41fb8548a8284c6451c8d1c1656d10d79e (diff) | |
this actually causes more trouble + will implement a bootstrap option in sisyphusv2.1812.1
| -rw-r--r-- | src/backend/c_jail.sh | 3 | ||||
| -rw-r--r-- | src/backend/f_makepkg.sh | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/backend/c_jail.sh b/src/backend/c_jail.sh index 945c964..0f751ff 100644 --- a/src/backend/c_jail.sh +++ b/src/backend/c_jail.sh @@ -3,8 +3,7 @@ export local jailsetupcmd="vasile --setup" export local jaildkmscmd="vasile --dkms" export local jailmandbcmd="mandb --create" -export local jailportagecmd="emerge -kav "$jailtarget"" -export local jailupgradecmd="emerge -NuDKv --backtrack=100 --with-bdeps=y @world --exclude linux-image-lts --exclude linux-headers-lts --exclude linux-image-redcore --exclude linux-sources-redcore" +export local jailportagecmd="emerge -Kav "$jailtarget"" export local jaildracutcmd="dracut -N -a dmsquash-live -a pollcdrom --force --kver="$kernver" /boot/"$jailramfsname"" export local jailmkchainloadercmd="grub2-mkimage -d /usr/lib64/grub/i386-pc -o core.img -O i386-pc biosdisk part_msdos fat -p /boot/grub" export local jailmkx64eficmd="grub2-mkimage -d /usr/lib64/grub/x86_64-efi -o bootx64.efi -O x86_64-efi ext2 fat udf btrfs ntfs reiserfs xfs hfsplus lvm ata part_msdos part_gpt part_apple bsd search_fs_uuid normal chain iso9660 configfile help loadenv reboot cat search memdisk tar boot linux chain -p /boot/grub" diff --git a/src/backend/f_makepkg.sh b/src/backend/f_makepkg.sh index 0ee8147..5111c41 100644 --- a/src/backend/f_makepkg.sh +++ b/src/backend/f_makepkg.sh @@ -48,10 +48,6 @@ jailpkgsetup () { chroot "$overlaypath" su - "$jailuser" -c "$jailsetupcmd" } -jailpkgupgrade () { - chroot "$overlaypath" su - "$jailuser" -c "$jailupgradecmd" -} - jailpkgbuild () { chroot "$overlaypath" su - "$jailuser" -c "$jailportagecmd" } @@ -66,7 +62,6 @@ makepkg () { checkjailsum jailpkgprep jailpkgsetup - jailpkgupgrade jailpkgbuild jailpkgstart jailpkgdmnt |