Some updates for 20-sudo, 21-usersetup and drop resolv.conf handling in cleanup script

[grml-live.git] / etc / grml / fai / grml / grml_cleanup_chroot

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 04bb3bb..213ee00 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -24,17 +24,17 @@
 # variables
   grep -q small /etc/grml_version && GRML_SMALL=yes  || GRML_SMALL=''
   [ -x /lib64 ] && GRML64=yes || GRML64=''
-  if [ -n "$GRML_SMALL" ] ; then
-     echo -n 'Are you sure you want to run GRML_SMALL stuff? [y|N] '
-     read a
-     if [ "$a" == 'y' ] ; then
-        echo 'Continuing as requested.'
-     else
-        echo 'Exiting as requested.'
-        unset GRML_SMALL
-        exit 1
-     fi
-  fi
+#  if [ -n "$GRML_SMALL" ] ; then
+#     echo -n 'Are you sure you want to run GRML_SMALL stuff? [y|N] '
+#     read a
+#     if [ "$a" == 'y' ] ; then
+#        echo 'Continuing as requested.'
+#     else
+#        echo 'Exiting as requested.'
+#        unset GRML_SMALL
+#        exit 1
+#     fi
+#  fi
 
 # detect kernel version, assume newest kernel version
   KERNEL=$(ls -1 /lib/modules/ | sort -r -u | head -1)
@@ -159,9 +159,9 @@ einfo "Unmounting proc, /dev/pts, /dev/capi"
   umount -a 2>/dev/null
 eend $?
 
-einfo "Removing initrd-images"
-  rm -f /boot/initrd.img-*
-eend $?
+#einfo "Removing initrd-images"
+#  rm -f /boot/initrd.img-*
+#eend $?
 
 einfo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
   # for i in $(find /var/lib/apt/lists -type f \( -name \*Packages -o -name \*Sources \) 2>/dev/null); do  :>"$i"; done
@@ -307,8 +307,7 @@ einfo "Cleaning and removing some misc files and directories"
          /var/run/*/* /var/run/* /var/log/ksymoops/* /var/lock/*/* /var/lock/*    \
          /var/state/*/* /var/state/* /var/log/nessus/*                            \
          /halt /reboot /ash.static /etc/dhcpc/*.info /etc/dhcpc/resolv*           \
-         /etc/resolv.conf /etc/*passwd- /etc/*shadow- /etc/*group-                \
-         /var/spool/postfix/maildrop/*                                            \
+         /etc/*passwd- /etc/*shadow- /etc/*group- /var/spool/postfix/maildrop/*   \
          /etc/lvm/.cache 2>/dev/null
   rm -rf /tmp/* /var/tmp/* /var/tmp/.* /var/backups/* /.ssh /root/.ssh /home/*/.ssh \
          /home/grml/* /home/grml/.??* /var/lib/texmf/ls-R  /var/spool/texmf/ls-R    \
@@ -324,29 +323,6 @@ einfo "Cleaning and removing some misc files and directories"
   :>/var/run/wtmp
 eend $?
 
-einfo "Setting up /etc/resolv.conf"
-  if [ -d /etc/dhcpc ] ; then
-    cat >/etc/dhcpc/resolv.conf <<EOT
-# insert nameservers here
-# nameserver 127.0.0.1
-EOT
-    chmod 644 /etc/dhcpc/resolv.conf
-  else
-    cat >/etc/resolv.conf <<EOT
-# insert nameservers here
-# nameserver 127.0.0.1
-EOT
-    chmod 644 /etc/resolv.conf
-  fi
-
-   # is resolvconf available?
-   if [ -r /etc/resolvconf/run/resolv.conf ] ; then
-      ln -sf /etc/resolvconf/run/resolv.conf /etc/
-   else
-      ln -s /etc/dhcpc/resolv.conf /etc/
-   fi
-eend $?
-
 if [ -x /usr/sbin/update-ca-certificates ] ; then
   einfo "Updating ca-certificates"
   update-ca-certificates 1>/dev/null
@@ -402,29 +378,29 @@ else
   ewarn "mandb not installed" ; eend 0
 fi
 
-if [ -n "$GRML_SMALL" ] ; then
-  einfo "Cleaning up /etc/skel..."
-  rm -rf /etc/skel/.fluxbox 
-  rm -rf /etc/skel/.gkrellm2 
-  rm -rf /etc/skel/.idesktop 
-  rm -rf /etc/skel/.pekwm
-  eend $?
-
-  einfo "Cleaning documentation directories..."
-  mv /usr/share/doc/grml-docs /tmp/
-  rm -rf /usr/share/doc
-  mkdir /usr/share/doc
-  mv /tmp/grml-docs /usr/share/doc/grml-docs
-  rm -rf /usr/share/gtk-doc/
-  rm -rf /usr/share/man/
-  rm -rf /usr/man
-  rm -rf /usr/share/info
-  eend $?
-
-  einfo "Creating /usr/share/info/..."
-  mkdir -p /usr/share/info/
-  eend $?
-fi
+#if [ -n "$GRML_SMALL" ] ; then
+#  einfo "Cleaning up /etc/skel..."
+#  rm -rf /etc/skel/.fluxbox 
+#  rm -rf /etc/skel/.gkrellm2 
+#  rm -rf /etc/skel/.idesktop 
+#  rm -rf /etc/skel/.pekwm
+#  eend $?
+#
+#  einfo "Cleaning documentation directories..."
+#  mv /usr/share/doc/grml-docs /tmp/
+#  rm -rf /usr/share/doc
+#  mkdir /usr/share/doc
+#  mv /tmp/grml-docs /usr/share/doc/grml-docs
+#  rm -rf /usr/share/gtk-doc/
+#  rm -rf /usr/share/man/
+#  rm -rf /usr/man
+#  rm -rf /usr/share/info
+#  eend $?
+#
+#  einfo "Creating /usr/share/info/..."
+#  mkdir -p /usr/share/info/
+#  eend $?
+#fi
 
 if [ -d /var/lib/clamav/ ] ; then
   einfo "Cleaning /var/lib/clamav/"