--arch <arch> Set target architecture, use for installing i386 on amd64.
--filesystem <fs> Filesystem that should be used when target is a partition
or Virtual Machine (see --vmfile).
- --insecure Do not download and check Release file signatures.
--force Do not prompt for user acknowledgement.
Options for Virtual Machine deployment:
eerror() {
[ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
- printf " ${BAD}*${NORMAL} $*\n"
+ printf " ${BAD}*${NORMAL} $*\n" >&2
LAST_E_CMD=eerror
return 0
}
[ "$_opt_bootappend" ] && BOOT_APPEND=$_opt_bootappend
[ "$_opt_grub" ] && GRUB=$_opt_grub
[ "$_opt_arch" ] && ARCH=$_opt_arch
-[ "$_opt_insecure" ] && SECURE='false'
+[ "$_opt_insecure" ] && echo "Warning: --insecure is deprecated, continuing anyway."
[ "$_opt_force" ] && FORCE=$_opt_force
[ "$_opt_verbose" ] && VERBOSE="-v"
fi
# }}}
-# keyring setupt {{{
-KEYRING=""
-if [ "$SECURE" = 'yes' ] ; then
- if [ -e '/etc/apt/trusted.gpg' ] ; then
- KEYRING="--keyring /etc/apt/trusted.gpg"
- else
- eerror "Could not find /etc/apt/trusted.gpg."
- fi
-else
- ewarn "Not checking Release signatures!"
-fi
-# }}}
-
# make sure we have the right syntax when using an iso image {{{
if [ -n "$ISO" ] ; then
case $ISO in
# execute chroot-script {{{
chrootscript() {
if ! [ -r "$MNTPOINT/bin/chroot-script" ] ; then
- mount_target
+ mount_target
fi
- if [ -x "$MNTPOINT/bin/chroot-script" ] ; then
- einfo "Executing chroot-script now"
- mount --bind /dev "$MNTPOINT"/dev
- chroot "$MNTPOINT" /bin/chroot-script ; RC=$?
- umount "$MNTPOINT"/dev
- eend $RC
+ if ! [ -x "$MNTPOINT/bin/chroot-script" ] ; then
+ eerror "Fatal: $MNTPOINT/bin/chroot-script could not be found."
+ eend 1
else
- eerror "Fatal: $MNTPOINT/bin/chroot-script could not be found."
- eend 1
+ einfo "Executing chroot-script now"
+ mount --bind /dev "$MNTPOINT"/dev
+ chroot "$MNTPOINT" /bin/chroot-script ; RC=$?
+ umount "$MNTPOINT"/dev
+ eend $RC
+ fi
+
+ # finally get rid of chroot-script again, there's no good reason to
+ # keep it on the installed system
+ if grep -q GRML_CHROOT_SCRIPT_MARKER "${MNTPOINT}/bin/chroot-script" ; then
+ einfo "Removing chroot-script again"
+ rm -f "${MNTPOINT}/bin/chroot-script"
+ eend $?
+ else
+ einfo "Keeping chroot-script as string GRML_CHROOT_SCRIPT_MARKER could not be found"
+ eend 0
fi
}
# }}}