X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=3ae79ee12f32140e5e662aa3e10644a16620f712;hp=b0d0c5299152900b7ae48d44e88635ca7d1d5009;hb=bba7c1961b43afcbe30097fc3fbbf6c53c57b1ac;hpb=2751e66f9bc407eecfcd506a2d43218f6a183684

diff --git a/chroot-script b/chroot-script
index b0d0c52..3ae79ee 100755
--- a/chroot-script
+++ b/chroot-script
@@ -88,7 +88,7 @@ chrootmirror() {
 
   # add security.debian.org:
   case "$RELEASE" in
-    unstable|sid) ;;  # no security pool available
+    unstable|sid|lenny) ;;  # no security pool available
     *)
       echo "Adding security.debian.org to sources.list."
       echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
@@ -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