mambawelcome: reconfigure grub first to make sure this is done even in case of later script errors

This commit is contained in:
Silvan Calarco 2012-08-07 13:31:13 +02:00
parent febe491142
commit d923fb5f91

View File

@ -44,6 +44,10 @@ Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
dcop_write $"Configuring..." 5 dcop_write $"Configuring..." 5
# update grub device mappings and config
/usr/sbin/grub-mkdevicemap -n
/usr/sbin/update-grub
[ -r $INPUT_FILE ] || { [ -r $INPUT_FILE ] || {
echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2 echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
abort abort
@ -159,10 +163,6 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
sed -i "s|netbios name =.*|netbios name = $INSTALL_HOSTNAME|" /etc/samba/smb.conf sed -i "s|netbios name =.*|netbios name = $INSTALL_HOSTNAME|" /etc/samba/smb.conf
} }
# update grub device mappings and config
/usr/sbin/grub-mkdevicemap -n
/usr/sbin/update-grub
# configure suspend (from suspend rpm post script) and recreate mkinitramfs # configure suspend (from suspend rpm post script) and recreate mkinitramfs
grep path_to_resume_device_file /etc/suspend.conf && { grep path_to_resume_device_file /etc/suspend.conf && {
SWAPLINE=`/sbin/swapon -s |grep -m1 ^/dev/` SWAPLINE=`/sbin/swapon -s |grep -m1 ^/dev/`