Merge branches

diff --git a/debian/changelog b/debian/changelog
index 622cb5b..69483ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ grml-live (0.0.5) unstable; urgency=low
     only it uxterm is not available.
   * Support /etc/locale.gen.grml - it's used by default in
     class GRML_FULL and a new class named LOCALES.
+  * New class SID - /etc/grml/fai/config/package_config/SID:
+    - this class is used for packages that are known to cause
+      problems with Debian/etch but work with Debian/sid
+  * Do not exit with an error code if /usr/include/linux is NOT
+    a symlink to /usr/src/linux/include/linux but keep it as
+    a warning instead.
   * Re-enable problematic packages that have been fixed:
     - apt-listbugs (fixed via manual interaction in scripts)
     - gsm-utils (#353967)

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index b0ccfdd..9e89329 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -47,13 +47,6 @@ PACKAGES aptitude
 #dpkg: error processing vifm (--configure):
 # subprocess post-installation script returned error exit status 1
 
-# snort (snort, snort-common, snort-rules-default):
-#Selecting previously deselected package snort.
-#Unpacking snort (from .../snort_2.7.0-3_i386.deb) ...
-#mkdir: cannot create directory `/var/log/fai/dirinstall/grml': No such file or directory
-#dpkg: error processing /var/cache/apt/archives/snort_2.7.0-3_i386.deb (--unpack):
-# subprocess pre-installation script returned error exit status 1
-
 # gsm-utils:
 # creates a group with GUID 1000 => #353967
 
@@ -1616,7 +1609,6 @@ snarf
 sniffit
 snmp
 snoopy
-snort
 snowdrop
 snownews
 socat
@@ -2085,6 +2077,9 @@ zd1211-firmware
 # x86/32bit (class I386) specific packages:
 PACKAGES aptitude I386
 
+# we also want to use linux-kernel-headers-grml instead of linux-libc-dev:
+linux-kernel-headers-grml
+
 #acx100-2.6.23-grml
 aufs-modules-2.6.23-grml
 #bcm5700-module-2.6.23-grml

diff --git a/etc/grml/fai/config/package_config/SID b/etc/grml/fai/config/package_config/SID
new file mode 100644 (file)
index 0000000..f3416b9
--- /dev/null
+++ b/etc/grml/fai/config/package_config/SID
@@ -0,0 +1,3 @@
+PACKAGES aptitude
+
+snort

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 6d75ea1..b75f55a 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -74,14 +74,14 @@ elif [ -n "$GRML64" ] ; then
     if [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
        einfo "grml64 detected, assuming /usr/src/linux-headers-$KERNEL is ok." ; eend 0
     else
-       ewarn "/usr/src/linux-headers-$KERNEL not found, exiting." ; eend 0
+       ewarn "Warning: /usr/src/linux-headers-$KERNEL not found, exiting." ; eend 0
     fi
 elif [ -d /usr/src/linux-headers-"$KERNEL" ] ; then
-     eerror "/usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ - error"
-     eend 1
-     exit 10
+     ewarn "Warning: /usr/include/linux is NOT a symlink to /usr/src/linux/include/linux/ (possible an error)"
+     ewarn "Common reason: you forgot to install linux-kernel-headers-grml and use linux-libc-dev instead"
+     eend 0
 else
-     ewarn "linux-headers-$KERNEL not installed." ; eend 0
+     ewarn "Warning: linux-headers-$KERNEL not installed." ; eend 0
 fi
 
 einfo "Creating ~/.zshrc"

diff --git a/grml-live b/grml-live
index f781b62..0612874 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -267,6 +267,7 @@ else
    # notice: 'fai dirinstall' does not seem to exit appropriate, so:
    ERROR=''
    if [ -r "/var/log/fai/dirinstall/$HOSTNAME/software.log" ] ; then
+      # 1 errors during executing of commands
       grep 'dpkg: error processing' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=1
       grep 'E: Method http has died unexpectedly!' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=2
       grep 'ERROR: chroot' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=3