[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8'
[ -n "$DISK_IDENTIFIER" ] || DISK_IDENTIFIER='26ada0c0-1165-4098-884d-aafd2220c2c6'
[ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes'
-[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian'
+[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://httpredir.debian.org/debian'
[ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no"
[ -n "$FORCE" ] || FORCE=''
[ -n "$HOSTNAME" ] || HOSTNAME='grml'
[ -n "$RECONFIGURE" ] || RECONFIGURE='console-data'
[ -n "$RELEASE" ] || RELEASE='jessie'
[ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes'
-[ -n "$SCRIPTS" ] || SCRIPTS='yes'
+[ -n "$SCRIPTS" ] || SCRIPTS='no' # deprecated, replaced by POST_SCRIPTS
[ -n "$SECURE" ] || SECURE='yes'
[ -n "$TIMEZONE" ] || TIMEZONE='Europe/Vienna'
[ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0'
einfo "Removing ${STAGES}" ; rmdir "$STAGES" ; eend $?
fi
- if [ "$REMOVE_CONFIGS" = "yes" ] ; then
- einfo "Removing configuration files from installed system as requested via --remove-configs / REMOVE_CONFIGS."
- rm -rf "${MNTPOINT}"/etc/debootstrap/
- eend $?
- fi
-
# Remove temporary mountpoint again
if echo "$MNTPOINT" | grep -q '/mnt/debootstrap\.' ; then
rmdir "$MNTPOINT" 2>/dev/null
[ "$_opt_packages_set" ] && PACKAGES='yes'
[ "$_opt_nopackages" ] && PACKAGES=''
[ "$_opt_debconf_set" ] && DEBCONF='yes'
-
-if [ "$_opt_scripts_set" ] ; then
- ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead."
- SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71
-fi
-
[ "$_opt_post_scripts_set" ] && POST_SCRIPTS='yes'
[ "$_opt_pre_scripts_set" ] && PRE_SCRIPTS='yes'
[ "$_opt_chroot_scripts_set" ] && CHROOT_SCRIPTS='yes'
[ "$_opt_contrib" ] && COMPONENTS="$COMPONENTS contrib"
[ "$_opt_non_free" ] && COMPONENTS="$COMPONENTS non-free"
+# command line option checks
+if [ "$_opt_scripts_set" ] ; then
+ ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead."
+ SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71
+fi
+
+if [ "$_opt_grub" ] && [ "$_opt_vmfile" ] ; then
+ eerror "The --grub option is incompatible with --vmfile, please drop it from your command line."
+ eerror "The --grub option is unneeded as GRUB will be installed automatically."
+ eend 1
+ bailout 1
+fi
+
+
if [ "$DEBUG" = "true" ] ; then
set -x
fi
# make sure we have what we need {{{
if [ -n "$VIRTUAL" ] ; then
- check4progs kpartx mksh parted qemu-img || bailout 1
+ check4progs kpartx parted qemu-img || bailout 1
fi
# }}}
[ $? -eq 0 ] || bailout
if [ "$CHOOSE_MIRROR" = 'net' ] ; then
- [ -n "$MIRROR" ] || MIRROR='http://http.debian.net/debian'
+ [ -n "$MIRROR" ] || MIRROR='http://httpredir.debian.org/debian'
MIRROR="$(dialog --stdout --title "${PN}" --inputbox \
"Please enter Debian mirror you would like to use for installing packages." \
0 0 $MIRROR)"
Using ISO: $ISO"
[ -n "$ARCH" ] && INFOTEXT="$INFOTEXT
Using arch: $ARCH"
+ [ -n "$CONFFILES" ] && INFOTEXT="$INFOTEXT
+ Config files: $CONFFILES"
INFOTEXT="$INFOTEXT
[ -n "$GRUB" ] && echo " Install grub: $GRUB" || echo " Install grub: no"
fi
- [ -n "$RELEASE" ] && echo " Using release: $RELEASE"
- [ -n "$HOSTNAME" ] && echo " Using hostname: $HOSTNAME"
- [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR"
- [ -n "$ISO" ] && echo " Using ISO: $ISO"
- [ -n "$ARCH" ] && echo " Using arch: $ARCH"
+ [ -n "$RELEASE" ] && echo " Using release: $RELEASE"
+ [ -n "$HOSTNAME" ] && echo " Using hostname: $HOSTNAME"
+ [ -n "$MIRROR" ] && echo " Using mirror: $MIRROR"
+ [ -n "$ISO" ] && echo " Using ISO: $ISO"
+ [ -n "$ARCH" ] && echo " Using arch: $ARCH"
+ [ -n "$CONFFILES" ] && echo " Config files: $CONFFILES"
if [ -n "$VIRTUAL" ] ; then
echo " Deploying as Virtual Machine."
if [ -n "$VMSIZE" -a -n "$VMFILE" ]; then
CURRENT_ARCH="$(uname -m)"
if [ "$CURRENT_ARCH" != "x86_64" ] ; then
if [ "$ARCH" = "amd64" ] ; then
- eerror "It is not possible to build amd64 on $CURRENT_ARCH." ; eend 1
+ eerror "It is not possible to build amd64 on $CURRENT_ARCH. Consider installing and booting the 'linux-image-amd64' kernel or using '--arch i386' instead." ; eend 1
bailout 1
fi
fi
if [ -n "$VMFILE" ]; then
qemu-img create -f raw "${TARGET}" "${VMSIZE}"
fi
- echo 4 66 | /usr/share/grml-debootstrap/bootgrub.mksh -A | dd of="$TARGET" conv=notrunc
- dd if=/dev/zero bs=1 conv=notrunc count=64 seek=446 of="$TARGET"
+ parted -s "${TARGET}" 'mklabel msdos'
if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
einfo "Adjusting disk signature to a fixed (non-random) value"
MBRTMPFILE=$(mktemp)
eend $?
fi
parted -s "${TARGET}" 'mkpart primary ext4 2M -1'
+ parted -s "${TARGET}" 'set 1 boot on'
# if dm-mod isn't available then kpartx will fail with
# "Is device-mapper driver missing from kernel? [...]"
cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/"
;;
esac
+ dd if="${MNTPOINT}/usr/lib/grub/i386-pc/boot.img" of="${ORIG_TARGET}" conv=notrunc bs=440 count=1
chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2
- dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=4
+ dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=1
rm -f "${MNTPOINT}/tmp/core.img"
fi
case "$RELEASE" in
lenny|squeeze|wheezy)
- if grep -q '^GRUB_DISABLE_LINUX_UUID=true' "${MNTPOINT}"/etc/default/grub 2>/dev/null ; then
+ if grep -q '^GRUB_DISABLE_LINUX_UUID=.*true' "${MNTPOINT}"/etc/default/grub 2>/dev/null ; then
ewarn "GRUB_DISABLE_LINUX_UUID is set to true in /etc/default/grub, not adjusting root= in grub.cfg."
ewarn "Please note that your system might NOT be able to properly boot."
else
# execute all scripts in /etc/debootstrap/pre-scripts/ {{{
execute_pre_scripts() {
# make sure hostname is set even before chroot-script get executed
- echo "$HOSTNAME" > /etc/hostname
+ echo "$HOSTNAME" > "$MNTPOINT"/etc/hostname
# make sure we have $MNTPOINT available for our scripts
export MNTPOINT
}
# }}}
+# get rid of grml-debootstrap config files {{{
+remove_configs() {
+ if [ "$REMOVE_CONFIGS" != "yes" ] ; then
+ return 0
+ fi
+
+ if ! mountpoint "${MNTPOINT}" >/dev/null 2>&1 ; then
+ ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files." ; eend 0
+ return 0
+ fi
+
+ einfo "Removing configuration files from installed system as requested via --remove-configs / REMOVE_CONFIGS."
+ rm -rf "${MNTPOINT}"/etc/debootstrap/
+ eend $?
+}
+# }}}
+
# now execute all the functions {{{
for i in prepare_vm mkfs tunefs mount_target debootstrap_system \
preparechroot execute_pre_scripts chrootscript execute_post_scripts \
- umount_chroot finalize_vm fscktool ; do
+ remove_configs umount_chroot finalize_vm fscktool ; do
if stage "${i}" ; then
if "$i" ; then
stage "${i}" 'done' && rm -f "${STAGES}/${i}"
projects / grml-debootstrap.git / blobdiff