init-install.sh: fix to handle the boot partition correctly
Previously, the boot partition was created for the target hard drive but there was no corresponding entry for it in /etc/fstab. Besides, even if the boot partition was mounted, it would just result in odd directory hierarchy like /boot/boot/grub. However, what we really need is /boot/grub. This patch fixes this problem. Besides, for future maintance work, this patch also renames some of the intermediate directories. It uses more descriptive names like /tgt_root and /src_root. The name of /ssd is dropped. [YOCTO #5018] (From OE-Core rev: aa67b1333b4774e1845f562085f7048df65a644f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d9e7fbad52
commit
059db226a0
|
@ -5,5 +5,5 @@ exec tail -n +3 $0
|
||||||
# the 'exec tail' line above.
|
# the 'exec tail' line above.
|
||||||
menuentry "Linux" {
|
menuentry "Linux" {
|
||||||
set root=(hd0,1)
|
set root=(hd0,1)
|
||||||
linux /boot/vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet
|
linux /vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet
|
||||||
}
|
}
|
||||||
|
|
|
@ -145,29 +145,32 @@ mkfs.ext3 $rootfs
|
||||||
echo "Formatting swap partition...($swap)"
|
echo "Formatting swap partition...($swap)"
|
||||||
mkswap $swap
|
mkswap $swap
|
||||||
|
|
||||||
mkdir /ssd
|
mkdir /tgt_root
|
||||||
mkdir /rootmnt
|
mkdir /src_root
|
||||||
mkdir /bootmnt
|
mkdir -p /boot
|
||||||
|
|
||||||
mount $rootfs /ssd
|
|
||||||
mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
|
|
||||||
|
|
||||||
|
# Handling of the target root partition
|
||||||
|
mount $rootfs /tgt_root
|
||||||
|
mount -o rw,loop,noatime,nodiratime /media/$1/$2 /src_root
|
||||||
echo "Copying rootfs files..."
|
echo "Copying rootfs files..."
|
||||||
cp -a /rootmnt/* /ssd
|
cp -a /src_root/* /tgt_root
|
||||||
|
if [ -d /tgt_root/etc/ ] ; then
|
||||||
if [ -d /ssd/etc/ ] ; then
|
echo "$swap swap swap defaults 0 0" >> /tgt_root/etc/fstab
|
||||||
echo "$swap swap swap defaults 0 0" >> /ssd/etc/fstab
|
echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
|
||||||
|
|
||||||
# We dont want udev to mount our root device while we're booting...
|
# We dont want udev to mount our root device while we're booting...
|
||||||
if [ -d /ssd/etc/udev/ ] ; then
|
if [ -d /tgt_root/etc/udev/ ] ; then
|
||||||
echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist
|
echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
umount /tgt_root
|
||||||
|
umount /src_root
|
||||||
|
|
||||||
|
# Handling of the target boot partition
|
||||||
|
mount $bootfs /boot
|
||||||
|
echo "Preparing boot partition..."
|
||||||
if [ -f /etc/grub.d/40_custom ] ; then
|
if [ -f /etc/grub.d/40_custom ] ; then
|
||||||
echo "Preparing custom grub2 menu..."
|
echo "Preparing custom grub2 menu..."
|
||||||
GRUBCFG="/bootmnt/boot/grub/grub.cfg"
|
GRUBCFG="/boot/grub/grub.cfg"
|
||||||
mount $bootfs /bootmnt
|
|
||||||
mkdir -p $(dirname $GRUBCFG)
|
mkdir -p $(dirname $GRUBCFG)
|
||||||
cp /etc/grub.d/40_custom $GRUBCFG
|
cp /etc/grub.d/40_custom $GRUBCFG
|
||||||
sed -i "s@__ROOTFS__@$rootfs $rootwait@g" $GRUBCFG
|
sed -i "s@__ROOTFS__@$rootfs $rootwait@g" $GRUBCFG
|
||||||
|
@ -177,31 +180,24 @@ if [ -f /etc/grub.d/40_custom ] ; then
|
||||||
sed -i "/#/d" $GRUBCFG
|
sed -i "/#/d" $GRUBCFG
|
||||||
sed -i "/exec tail/d" $GRUBCFG
|
sed -i "/exec tail/d" $GRUBCFG
|
||||||
chmod 0444 $GRUBCFG
|
chmod 0444 $GRUBCFG
|
||||||
umount /bootmnt
|
|
||||||
fi
|
fi
|
||||||
|
grub-install /dev/${device}
|
||||||
umount /ssd
|
echo "(hd0) /dev/${device}" > /boot/grub/device.map
|
||||||
umount /rootmnt
|
|
||||||
|
|
||||||
echo "Preparing boot partition..."
|
|
||||||
mount $bootfs /ssd
|
|
||||||
grub-install --root-directory=/ssd /dev/${device}
|
|
||||||
|
|
||||||
echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
|
|
||||||
|
|
||||||
# If grub.cfg doesn't exist, assume GRUB 0.97 and create a menu.lst
|
# If grub.cfg doesn't exist, assume GRUB 0.97 and create a menu.lst
|
||||||
if [ ! -f /ssd/boot/grub/grub.cfg ] ; then
|
if [ ! -f /boot/grub/grub.cfg ] ; then
|
||||||
echo "Preparing custom grub menu..."
|
echo "Preparing custom grub menu..."
|
||||||
echo "default 0" > /ssd/boot/grub/menu.lst
|
echo "default 0" > /boot/grub/menu.lst
|
||||||
echo "timeout 30" >> /ssd/boot/grub/menu.lst
|
echo "timeout 30" >> /boot/grub/menu.lst
|
||||||
echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst
|
echo "title Live Boot/Install-Image" >> /boot/grub/menu.lst
|
||||||
echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
|
echo "root (hd0,0)" >> /boot/grub/menu.lst
|
||||||
echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
|
echo "kernel /vmlinuz root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp /media/$1/vmlinuz /ssd/boot/
|
cp /media/$1/vmlinuz /boot/
|
||||||
|
|
||||||
|
umount /boot
|
||||||
|
|
||||||
umount /ssd
|
|
||||||
sync
|
sync
|
||||||
|
|
||||||
echo "Remove your installation media, and press ENTER"
|
echo "Remove your installation media, and press ENTER"
|
||||||
|
|
Loading…
Reference in New Issue