diff --git a/debian/initrd-tools.e2fsprogs b/debian/initrd-tools.e2fsprogs deleted file mode 100644 index ed49db41..00000000 --- a/debian/initrd-tools.e2fsprogs +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# /usr/share/initrd-tools/scripts/e2fsprogs -# -cp /usr/share/e2fsprogs/initrd.ext3-add-journal \ - $INITRDDIR/scripts/ext3-add-journal.sh -cp /sbin/tune2fs $INITRDDIR/sbin -cp /usr/lib/e2initrd_helper $INITRDDIR/bin/e2initrd_helper - -case "$VERSION" in - 2.4.*) - case "uname -r" in - 2.4.*) : ;; - *) LD_ASSUME_KERNEL=2.4.1 - export LD_ASSUME_KERNEL - ;; - esac - ;; -esac - -PROGS="/sbin/tune2fs /usr/lib/e2initrd_helper" -LIBS=`unset LD_LIBRARY_PATH LD_PRELOAD; ldd $PROGS | \ - grep -vE 'linux-gate.so|linux-vdso.so' | sort -u | awk '{print $3}'` -for i in $LIBS -do - if test -f /etc/ld.so.preload && grep -s ^$i\$ /etc/ld.so.preload; then - continue - fi - mkdir -p `dirname $INITRDDIR/$i` - cp $i $INITRDDIR/$i -done diff --git a/debian/initrd.ext3-add-journal b/debian/initrd.ext3-add-journal deleted file mode 100644 index 4def7b18..00000000 --- a/debian/initrd.ext3-add-journal +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# /usr/share/e2fsprogs/initrd.ext3-add-journal -# -cd / -mount -nt proc proc proc -rootdev=$(cat proc/sys/kernel/real-root-dev) -cmdline=$(cat /proc/cmdline) -umount -n proc -if [ $rootdev != 256 -a $rootdev != 255 ]; then - mount -nt tmpfs tmpfs /dev2 - get_device - roottype=`/bin/e2initrd_helper -r /dev2/root2` - if test -n "$roottype" ; then - mount -nt tmpfs tmpfs /etc - echo >> /etc/fstab - echo >> /etc/mtab - if test "$roottype" = "ext3" ; then - /sbin/tune2fs -O has_journal /dev2/root2 > /dev/null 2>&1 - else - /sbin/tune2fs -O ^has_journal /dev2/root2 > /dev/null 2>&1 - fi - umount -n /etc - fi - umount -n /dev2 - umount -n /proc > /dev/null 2>&1 -fi diff --git a/debian/rules b/debian/rules index 495c8571..9fe59e63 100755 --- a/debian/rules +++ b/debian/rules @@ -385,17 +385,6 @@ binary-arch: install install-udeb $(INSTALL) -m 0644 -D -p debian/$$i ${debdir}/$${pkg}/usr/share/lintian/overrides/$${pkg} ;\ done - # mkinitrd script - mkdir -p debian/e2fsprogs/usr/share/initrd-tools/scripts - $(INSTALL) -p -o root -g root -m 0755 debian/initrd-tools.e2fsprogs \ - debian/e2fsprogs/usr/share/initrd-tools/scripts/e2fsprogs - - # initrd script - mkdir -p debian/e2fsprogs/usr/share/e2fsprogs - $(INSTALL) -p -o root -g root -m 0755 debian/initrd.ext3-add-journal \ - debian/e2fsprogs/usr/share/e2fsprogs/initrd.ext3-add-journal - - # symlinks to prepare dh_installdocs run ifneq ($(UTIL_LINUX_NG),yes)