From 240356a6cbef40d62b013cbd680c3d61095681d7 Mon Sep 17 00:00:00 2001
From: Lucas Manika Koeb <lmk08@c3sl.ufpr.br>
Date: Tue, 18 Jun 2013 10:56:32 -0300
Subject: [PATCH] Revert "Avoid grub-prob errors on le5 and minicom isos"
This reverts commit 96c852c1571a9f00d7df24eac6b17fc9303d093b.
---
scripts/00-update | 6 ------
scripts/40-configure_le5 | 2 --
scripts/40-configure_minicom | 2 --
3 files changed, 10 deletions(-)
diff --git a/scripts/00-update b/scripts/00-update
index 502f1a2..2e27d99 100755
--- a/scripts/00-update
+++ b/scripts/00-update
@@ -95,12 +95,6 @@ chroot "$CHROOTDIR" apt-get -y --force-yes update
# rest of the process
chroot "$CHROOTDIR" apt-get -y --force-yes install le-autoupgrade
-# Avoid grub-probe errors
-cp -f "$CHROOTDIR"/usr/sbin/grub-probe "$CHROOTDIR"/usr/sbin/grub-probe.tmp
-echo "#!/bin/bash" > "$CHROOTDIR"/usr/sbin/grub-probe
-echo "exit 0" >> "$CHROOTDIR"/usr/sbin/grub-probe
-chmod a+x "$CHROOTDIR"/usr/sbin/grub-probe
-
closeChroot
exit 0
diff --git a/scripts/40-configure_le5 b/scripts/40-configure_le5
index 031b062..898f62a 100755
--- a/scripts/40-configure_le5
+++ b/scripts/40-configure_le5
@@ -96,8 +96,6 @@ chroot $CHROOTDIR dpkg-reconfigure le-greeter
cp -f "$TEMPLATES"/casper/10adduser \
"$CHROOTDIR"/usr/share/initramfs-tools/scripts/casper-bottom/10adduser
-mv "$CHROOTDIR"/usr/sbin/grub-probe.tmp "$CHROOTDIR"/usr/sbin/grub-probe
-
# Sets deb-conf install command
sed -i 's@Ubuntu@LE@g' "$CDDIR"/preseed/ubuntu.seed
sed -i 's@ubuntu@le@g' "$CDDIR"/preseed/ubuntu.seed
diff --git a/scripts/40-configure_minicom b/scripts/40-configure_minicom
index 08f6eb6..708a148 100755
--- a/scripts/40-configure_minicom
+++ b/scripts/40-configure_minicom
@@ -95,8 +95,6 @@ esac
echo "export \"FLAVOUR=le5\"" >> "$CHROOTDIR"/etc/casper.conf
-mv "$CHROOTDIR"/usr/sbin/grub-probe.tmp "$CHROOTDIR"/usr/sbin/grub-probe
-
# Sets deb-conf install command
sed -i 's@Ubuntu@LE@g' "$CDDIR"/preseed/ubuntu.seed
sed -i 's@ubuntu@le@g' "$CDDIR"/preseed/ubuntu.seed
--
GitLab