projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Updated grml-debootstrap parameter handling"
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
53f1e20
..
2e386bf
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-11,7
+11,7
@@
set -e # exit on any error
# variables {{{
PN="$(basename $0)"
# variables {{{
PN="$(basename $0)"
-VERSION='0.3
3-pre1
'
+VERSION='0.3
4
'
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
@@
-237,7
+237,7
@@
prompt_for_bootmanager()
MBRDISK=$(readlink -f $MBRDISK)
else
# fall back to old behaviour
MBRDISK=$(readlink -f $MBRDISK)
else
# fall back to old behaviour
- MBRDISK=$(echo ${TARGET} | sed -e 's/[0-9][0-9]*$/')
+ MBRDISK=$(echo ${TARGET} | sed -e 's/[0-9][0-9]*$/
/
')
fi
MBRPART="MBR of $MBRDISK"
fi
MBRPART="MBR of $MBRDISK"
@@
-576,6
+576,10
@@
set_target_directory(){
TUNE2FS=''
FSCK=''
GRUB=''
TUNE2FS=''
FSCK=''
GRUB=''
+ # make sure we normalise the path to an absolute directory name so something like:
+ # mkdir -p foo/a bar/a; (cd foo; grml-debootstrap -t a)&; (cd bar; grml-debootstrap -t a)&; wait
+ # works
+ TARGET="$(readlink -f $TARGET)"
}
if [ -b "$TARGET" ] ; then
}
if [ -b "$TARGET" ] ; then
@@
-754,8
+758,10
@@
debootstrap_system() {
if grep -q "$MNTPOINT" /proc/mounts || [ -n "$DIRECTORY" ] ; then
einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}"
if [ -n "$MIRROR" ] ; then
if grep -q "$MNTPOINT" /proc/mounts || [ -n "$DIRECTORY" ] ; then
einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}"
if [ -n "$MIRROR" ] ; then
+ einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR"
$DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR
else
$DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR
else
+ einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO"
$DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO
fi
eend $?
$DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO
fi
eend $?
@@
-916,18
+922,21
@@
grub_install() {
return 0
fi
return 0
fi
+ if ! [ -x "$(which grub-install)" ] ; then
+ echo "Error: grub-install not available. (Error while installing grub package?)"
+ return 1
+ fi
+
if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid
for device in $SELECTED_PARTITIONS ; do
GRUB="${device%%[0-9]}"
einfo "Installing grub on ${GRUB}:"
if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid
for device in $SELECTED_PARTITIONS ; do
GRUB="${device%%[0-9]}"
einfo "Installing grub on ${GRUB}:"
- [ -x /usr/sbin/grub-install ] && GRUBINSTALL="/usr/sbin/grub-install --no-floppy" || GRUBINSTALL="/sbin/grub-install --no-floppy"
- $GRUBINSTALL --root-directory="$MNTPOINT" "$GRUB"
+ grub-install --no-floppy --root-directory="$MNTPOINT" "$GRUB"
eend $?
done
else
einfo "Installing grub on ${GRUB}:"
eend $?
done
else
einfo "Installing grub on ${GRUB}:"
- [ -x /usr/sbin/grub-install ] && GRUBINSTALL="/usr/sbin/grub-install --no-floppy" || GRUBINSTALL="/sbin/grub-install --no-floppy"
- $GRUBINSTALL --root-directory="$MNTPOINT" "$GRUB"
+ grub-install --no-floppy --root-directory="$MNTPOINT" "$GRUB"
eend $?
fi
}
eend $?
fi
}