Support --nokernel option to skip installation of default kernel images

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index bbc91f0..ce3f624 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -223,7 +223,7 @@ upgrade_system() {
   if [ "$UPGRADE_SYSTEM" = "yes" ] ; then
     echo "Running update + upgrade"
     $APTUPDATE
-    $APTUPGRADE
+    DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTUPGRADE
   else
     echo "Not running update + upgrade as \$UPDATE_AND_UPGRADE is not set to 'yes'."
   fi
@@ -311,6 +311,11 @@ get_kernel_version() {
 
 # install kernel packages {{{
 kernel() {
+  if [ -n "$NOKERNEL" ] ; then
+    echo "Skipping installation of kernel packages as requested via --nokernel"
+    return 0
+  fi
+
   $APTUPDATE
   KVER=$(get_kernel_version)
   if [ -n "$KVER" ] ; then
@@ -466,7 +471,7 @@ proc           /proc        proc    defaults                      0   0
 # some other examples:
 # /dev/sda2       none         swap    sw,pri=0             0   0
 # /dev/hda1       /Grml        ext3    dev,suid,user,noauto 0  2
-# //1.2.3.4/pub   /smb/pub     smbfs   defaults,user,noauto,uid=grml,gid=grml 0 0
+# //1.2.3.4/pub   /smb/pub     cifs    user,noauto,uid=grml,gid=grml 0 0
 # linux:/pub      /beer        nfs     defaults             0  0
 # tmpfs           /tmp         tmpfs   size=300M            0  0
 # /dev/sda5       none         swap    sw                   0  0