projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
display architecture in checkconfiguration summary
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
023ccff
..
7caf4dd
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-5,6
+5,9
@@
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
################################################################################
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
################################################################################
+# GRML_CHROOT_SCRIPT_MARKER - do not remove this line unless you want to keep
+# this script as /bin/chroot-script on your new installed system
+################################################################################
. /etc/debootstrap/config || exit 1
. /etc/debootstrap/variables || exit 1
. /etc/debootstrap/config || exit 1
. /etc/debootstrap/variables || exit 1
@@
-362,7
+365,6
@@
fi
cat >> /etc/fstab << EOF
proc /proc proc defaults 0 0
cat >> /etc/fstab << EOF
proc /proc proc defaults 0 0
-/sys /sys sysfs noauto,rw,nosuid,nodev,noexec 0 0
/dev/cdrom /mnt/cdrom0 iso9660 ro,user,noauto 0 0
# some other examples:
# /dev/sda2 none swap sw,pri=0 0 0
/dev/cdrom /mnt/cdrom0 iso9660 ro,user,noauto 0 0
# some other examples:
# /dev/sda2 none swap sw,pri=0 0 0
@@
-431,8
+433,8
@@
initrd() {
grub_install() {
if [ -z "$GRUB" ] ; then
grub_install() {
if [ -z "$GRUB" ] ; then
-
echo "Notice: \$GRUB not defined, will not install grub therefor
e."
-
return 0
+
echo "Notice: \$GRUB not defined, will not install grub inside chroot at this stag
e."
+ return 0
fi
if ! dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then
fi
if ! dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then