Merge remote-tracking branch 'origin/pr/241'

diff --git a/Makefile b/Makefile
index 8108abb..20e533b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ install:
        mkdir -p $(DESTDIR)/usr/sbin/
        mkdir -p $(DESTDIR)/usr/share/zsh/vendor-completions
        install -m 644 config           $(DESTDIR)/etc/debootstrap/
-       install -m 644 devices.tar.gz   $(DESTDIR)/etc/debootstrap/
        install -m 644 locale.gen       $(DESTDIR)/etc/debootstrap/
        install -m 644 packages         $(DESTDIR)/etc/debootstrap/
        install -m 644 packages-arm64   $(DESTDIR)/etc/debootstrap/

diff --git a/debian/grml-debootstrap.maintscript b/debian/grml-debootstrap.maintscript
index a60be94..936057b 100644 (file)
--- a/debian/grml-debootstrap.maintscript
+++ b/debian/grml-debootstrap.maintscript
@@ -1 +1,2 @@
+rm_conffile /etc/debootstrap/devices.tar.gz 0.105~
 rm_conffile /etc/zsh/completion.d/_grml-debootstrap 0.86~

diff --git a/devices.tar.gz b/devices.tar.gz
deleted file mode 100644 (file)
index 0d02e40..0000000
Binary files a/devices.tar.gz and /dev/null differ

diff --git a/grml-debootstrap b/grml-debootstrap
index 76c3648..f52b8cb 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -1892,9 +1892,6 @@ preparechroot() {
   # setup default locales
   [ -n "$LOCALES" ] && cp $VERBOSE "${CONFFILES}"/locale.gen "${MNTPOINT}"/etc/locale.gen
 
-  # MAKEDEV is just a forking bomb crap, let's do it on our own instead :)
-  ( cd "${MNTPOINT}"/dev && tar zxf /etc/debootstrap/devices.tar.gz )
-
   # copy any existing files to chroot
   [ -d "${CONFFILES}"/bin   ] && cp $VERBOSE -a -L "${CONFFILES}"/bin/*   "${MNTPOINT}"/bin/
   [ -d "${CONFFILES}"/boot  ] && cp $VERBOSE -a -L "${CONFFILES}"/boot/*  "${MNTPOINT}"/boot/