No longer install PuTTY and other windows binaries

[grml-live-grml.git] / grml-live

diff --git a/grml-live b/grml-live
index 4d77252..5001091 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -277,7 +277,6 @@ shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
 [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
 [ -n "$USERNAME" ]         || USERNAME='grml'
 [ -n "$VERSION" ]          || VERSION='0.0.1'
-[ -n "$WINDOWS_BINARIES" ] || WINDOWS_BINARIES='http://the.earth.li/~sgtatham/putty/latest/x86/'
 
 # output specific stuff, depends on $OUTPUT (iff not set):
 [ -n "$OUTPUT" ]           || OUTPUT='/grml/grml-live'
@@ -540,12 +539,18 @@ else
          mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
       fi
 
+      # tell dpkg to use "unsafe io" during the build
+      [ -d "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d" ] || mkdir -p "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d"
+      echo force-unsafe-io > "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d/unsafe-io"
+
       log "Executed FAI command line:"
       log "BUILD_ONLY=$BUILD_ONLY BOOTSTRAP_ONLY=$BOOTSTRAP_ONLY fai $VERBOSE -C $GRML_FAI_CONFIG -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS"
       BUILD_ONLY="$BUILD_ONLY" BOOTSTRAP_ONLY="$BOOTSTRAP_ONLY" fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u \
       "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE
       RC="$PIPESTATUS" # notice: bash-only
 
+      rm -f "$CHROOT_OUTPUT/etc/dpkg/dpkg.cfg.d/unsafe-io"
+
       FORCE_ISO_REBUILD=true
 
       if [ "$RC" != 0 ] ; then
@@ -557,9 +562,13 @@ else
          echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$DATE]" > $CHROOT_OUTPUT/etc/grml_version
          chmod 644 $CHROOT_OUTPUT/etc/grml_version
          einfo "Rebuilding initramfs"
-         # make sure new /etc/grml_version reaches the initramfs:
+         # make sure new /etc/grml_version reaches initramfs, iterate over all
+         # present kernel versions (note: we can't really handle more than one
+         # kernel version anyway right now)
          # chroot $CHROOT_OUTPUT update-initramfs -u -t => might break when using kernel-package :(
-         chroot $CHROOT_OUTPUT update-initramfs -u -k all
+         for initrd in "$(basename $CHROOT_OUTPUT/boot/vmlinuz-*)" ; do
+           chroot $CHROOT_OUTPUT update-initramfs -k "${initrd##vmlinuz-}" -c
+         done
          eend $?
       fi
 
@@ -909,30 +918,6 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
           cp ${TEMPLATE_DIRECTORY}/windows/autostart/* "$BUILD_OUTPUT"/
        fi
 
-       # windows-binaries:
-       if [ -n "$NO_WINDOWS_BINARIES" ] ; then
-          log   "Skipping download of windows binaries as requested via \$NO_WINDOWS_BINARIES."
-          einfo "Skipping download of windows binaries as requested via \$NO_WINDOWS_BINARIES."
-          eend 0
-       else
-          if [ -f "$BUILD_OUTPUT"/windows/putty.exe ] ; then
-             log   "Skipping stage 'WINDOWS_BINARIES' as $BUILD_OUTPUT/windows exists already."
-             ewarn "Skipping stage 'WINDOWS_BINARIES' as $BUILD_OUTPUT/windows exists already." ; eend 0
-          else
-             if ! [ -d "$BUILD_OUTPUT"/windows ] ; then
-                mkdir "$BUILD_OUTPUT"/windows
-                ( cd "$BUILD_OUTPUT"/windows
-                  for file in pageant plink pscp psftp putty puttygen ; do
-                     wget -O ${file}.exe ${WINDOWS_BINARIES}/${file}.exe
-                     md5sum ${file}.exe > ${file}.exe.md5
-                  done )
-             fi
-
-             log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]"
-             einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0
-          fi
-       fi
-
     FORCE_ISO_REBUILD=true
     einfo "Finished execution of stage 'boot'" ; eend 0
     fi