# }}}
# grub configuration/installation {{{
-grub_config() {
+grub_install() {
+
if [ -z "$GRUB" ] ; then
- echo "Warning: \$GRUB is not defined, will not adjust grub configuration therefore."
+ echo "Notice: \$GRUB not defined, will not install grub therefore."
+ return 0
+ fi
+
+ if ! [ -x "$(which grub-install)" ] ; then
+ echo "Error: grub-install not available. (Error while installing grub package?)" >&2
+ return 1
+ fi
+
+ if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid
+ for device in $SELECTED_PARTITIONS ; do
+ GRUB="${device%%[0-9]}"
+ echo "Installing grub on ${GRUB}:"
+ grub-install --no-floppy "$GRUB"
+ done
else
- echo "Adjusting grub configuration for use on ${GRUB}."
+ echo "Installing grub on ${GRUB}:"
+ grub-install --no-floppy "$GRUB"
+ fi
- # finally install grub
- if [ -x /usr/sbin/update-grub ] ; then
- UPDATEGRUB='/usr/sbin/update-grub'
- elif [ -x /sbin/update-grub ] ; then
- UPDATEGRUB='/sbin/update-grub'
- else
- echo "Error: update-grub not available, can not execute it."
- return 1
- fi
+ echo "Adjusting grub configuration for use on ${GRUB}."
- # grub2:
- $UPDATEGRUB
+ # finally install grub
+ if [ -x /usr/sbin/update-grub ] ; then
+ UPDATEGRUB='/usr/sbin/update-grub'
+ elif [ -x /sbin/update-grub ] ; then
+ UPDATEGRUB='/sbin/update-grub'
+ else
+ echo "Error: update-grub not available, can not execute it." >&2
+ return 1
fi
+
+ $UPDATEGRUB
}
# }}}
for i in chrootmirror grmlrepos kernelimg_conf \
kernel packages extrapackages reconfigure hosts interfaces \
- timezone fstab hostname initrd grub_config passwords \
+ timezone fstab hostname initrd grub_install passwords \
custom_scripts remove_apt_cache services ; do
if stage $i ; then
$i && stage $i done || exit 1
[ -n "$INSTALL_NOTES" ] && echo "INSTALL_NOTES=$INSTALL_NOTES" >> $CHROOT_VARIABLES
[ -n "$ISODIR" ] && echo "ISODIR=$ISO" >> $CHROOT_VARIABLES
[ -n "$ISO" ] && echo "ISO=$ISO" >> $CHROOT_VARIABLES
- [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> $CHROOT_VARIABLES
[ -n "$KEEP_SRC_LIST" ] && echo "KEEP_SRC_LIST=$KEEP_SRC_LIST" >> $CHROOT_VARIABLES
+ [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> $CHROOT_VARIABLES
[ -n "$PACKAGES" ] && echo "PACKAGES=$PACKAGES" >> $CHROOT_VARIABLES
+ [ -n "$RM_APTCACHE" ] && echo "RM_APTCACHE=$RM_APTCACHE" >> $CHROOT_VARIABLES
[ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES
+ [ -n "$SELECTED_PARTITIONS" ] && echo "SELECTED_PARTITIONS=$SELECTED_PARTITIONS" >> $CHROOT_VARIABLES
[ -n "$TARGET" ] && echo "TARGET=$TARGET" >> $CHROOT_VARIABLES
[ -n "$TARGET_UUID" ] && echo "TARGET_UUID=$TARGET_UUID" >> $CHROOT_VARIABLES
- [ -n "$RM_APTCACHE" ] && echo "RM_APTCACHE=$RM_APTCACHE" >> $CHROOT_VARIABLES
cp $VERBOSE $CONFFILES/chroot-script $MNTPOINT/bin/chroot-script
chmod 755 $MNTPOINT/bin/chroot-script
}
# }}}
-# install booloader grub {{{
-grub_install() {
- if [ -z "$GRUB" ] ; then
- echo "Notice: \$GRUB not defined, will not install grub therefore."
- return 0
- fi
-
- if ! [ -x "$(which grub-install)" ] ; then
- echo "Error: grub-install not available. (Error while installing grub package?)"
- return 1
- fi
-
- if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid
- for device in $SELECTED_PARTITIONS ; do
- GRUB="${device%%[0-9]}"
- einfo "Installing grub on ${GRUB}:"
- grub-install --no-floppy --root-directory="$MNTPOINT" "$GRUB"
- eend $?
- done
- else
- einfo "Installing grub on ${GRUB}:"
- grub-install --no-floppy --root-directory="$MNTPOINT" "$GRUB"
- eend $?
- fi
-}
-# }}}
-
# unmount $MNTPOINT {{{
umount_chroot() {
# now execute all the functions {{{
for i in mkfs tunefs mount_target debootstrap_system preparechroot \
- execute_pre_scripts chrootscript execute_scripts grub_install umount_chroot \
+ execute_pre_scripts chrootscript execute_scripts umount_chroot \
fscktool ; do
if stage "${i}" ; then
$i && ( stage "${i}" done && rm -f "${STAGES}/${i}" ) || bailout 2 "i"