root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed lts code in setup

Browse source
This commit is contained in:
Tobias Powalowski 2009-12-22 22:11:50 +01:00
parent d87e99aa48
commit 45dc8449a5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr/share/archboot/installer/setup
View file

@ -11,6 +11,9 @@ EDITOR=
# name of the kernel image # name of the kernel image
VMLINUZ="vmlinuz26" VMLINUZ="vmlinuz26"
[ "$(cat /proc/cmdline | grep -w BOOT_IMAGE=.*lts)" ] && VMLINUZ="vmlinuz26-lts" [ "$(cat /proc/cmdline | grep -w BOOT_IMAGE=.*lts)" ] && VMLINUZ="vmlinuz26-lts"
# name of kernel package
KERNELPKG="kernel26"
[ "$(cat /proc/cmdline | grep -w BOOT_IMAGE=.*lts)" ] && VMLINUZ="kernel26-lts"
# abstract the common pacman args # abstract the common pacman args
PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogressbar" PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogressbar"
@ -2136,7 +2139,7 @@ installpkg() {
[ -e /var/state/dhcp/dhclient.leases ] && ! [ "$(grep -w dhclient $PACKAGES)" ] && PACKAGES="$PACKAGES dhclient" [ -e /var/state/dhcp/dhclient.leases ] && ! [ "$(grep -w dhclient $PACKAGES)" ] && PACKAGES="$PACKAGES dhclient"
# Only install the booted kernel image! # Only install the booted kernel image!
PACKAGES="$(echo $PACKAGES | sed -e "s#\ kernel26\ # #g" -e "s#\ kernel26-lts\ # #g")" PACKAGES="$(echo $PACKAGES | sed -e "s#\ kernel26\ # #g" -e "s#\ kernel26-lts\ # #g")"
PACKAGES="$PACKAGES $(echo $VMLINUZ | sed -e 's#vmlinuz#kernel#g')" PACKAGES="$PACKAGES $KERNELPKG"
# create chroot environment on target system # create chroot environment on target system
# code straight from mkarchroot # code straight from mkarchroot
chroot_mount chroot_mount
@ -2904,7 +2907,7 @@ run_mkinitcpio()
( \ ( \
touch /tmp/setup-mkinitcpio-running touch /tmp/setup-mkinitcpio-running
echo "Initramfs progress ..." > /tmp/initramfs.log; echo >> /tmp/mkinitcpio.log echo "Initramfs progress ..." > /tmp/initramfs.log; echo >> /tmp/mkinitcpio.log
chroot $DESTDIR /sbin/mkinitcpio -p $VMLINUZ >>/tmp/mkinitcpio.log 2>&1 chroot $DESTDIR /sbin/mkinitcpio -p $KERNELPKG >>/tmp/mkinitcpio.log 2>&1
echo >> /tmp/mkinitcpio.log echo >> /tmp/mkinitcpio.log
rm -f /tmp/setup-mkinitcpio-running rm -f /tmp/setup-mkinitcpio-running
) & ) &