X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=1c5d8b7e7bb0b02bb6217fdf3834ce82f55e526a;hp=0637089fdc58751aaf0efbc0b6f6e99d4855642a;hb=b8f3c830f22b6a2cc74cf94166864d87c03c5f65;hpb=e426be2b57c02a85774bc72462224e4fd0260421 diff --git a/grml-debootstrap b/grml-debootstrap index 0637089..1c5d8b7 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -40,7 +40,7 @@ fi # variables {{{ PN="$(basename "$0")" -if [[ -d "$(dirname "$(which "$0")")"/.git ]]; then +if [[ -d "$(dirname "$(command -v "$0")")"/.git ]]; then VERSION="$(git describe | sed 's|^v||')" else VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")" @@ -58,7 +58,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -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://httpredir.debian.org/debian' +[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://deb.debian.org/debian' [ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no" [ -n "$FORCE" ] || FORCE='' [ -n "$HOSTNAME" ] || HOSTNAME='grml' @@ -186,7 +186,7 @@ WARN='' NORMAL='' einfo() { - einfon "$1\n" + einfon "$1\\n" return 0 } @@ -198,13 +198,13 @@ einfon() { } ewarn() { - printf " %s*%s $*\n" "${WARN}" "${NORMAL}" + printf " %s*%s $*\\n" "${WARN}" "${NORMAL}" return 0 } eerror() { [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " %s*%s $*\n" "${BAD}" "${NORMAL}" >&2 + printf " %s*%s $*\\n" "${BAD}" "${NORMAL}" >&2 LAST_E_CMD=eerror return 0 } @@ -213,7 +213,7 @@ eend() { local retval="${1:-0}" shift if [ "$retval" -gt 0 ]; then - printf " %s-> Failed (rc=%s)%s\n" "${BAD}" "${retval}" "${NORMAL}" + printf " %s-> Failed (rc=%s)%s\\n" "${BAD}" "${retval}" "${NORMAL}" fi return "$retval" } @@ -227,7 +227,7 @@ check4root(){ check4progs(){ local RC='' for arg in "$@" ; do - which "$arg" >/dev/null 2>&1 || RC="$arg" + command -v "$arg" >/dev/null 2>&1 || RC="$arg" done if [ -n "$RC" ] ; then echo "$RC not installed" @@ -339,19 +339,174 @@ fi # }}} # cmdline handling {{{ -# source external command line parameter-processing script -self_dir="$(dirname "$(which "$0")")" -if [ -r "${self_dir}"/cmdlineopts.clp ] ; then - # shellcheck source=cmdlineopts.clp - . "${self_dir}"/cmdlineopts.clp -elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then - # shellcheck source=cmdlineopts.clp - . /usr/share/grml-debootstrap/functions/cmdlineopts.clp -else - eerror "Error: cmdline function file not found, exiting." - eend 1 - bailout 1 +CMDLINE_OPTS=mirror:,iso:,release:,target:,mntpoint:,debopt:,defaultinterfaces,interactive,nodebootstrap,nointerfaces,nokernel,nopackages,filesystem:,config:,confdir:,packages:,chroot-scripts:,scripts:,post-scripts:,pre-scripts:,debconf:,vm,vmfile,vmsize:,keep_src_list,hostname:,password:,nopassword,grmlrepos,backportrepos,bootappend:,grub:,efi:,arch:,insecure,verbose,help,version,force,debug,contrib,non-free,remove-configs + +_opt_temp=$(getopt --name grml-debootstrap -o +m:i:r:t:p:c:d:vhV --long \ + $CMDLINE_OPTS -- "$@") + +if [ $? != 0 ]; then + eerror "Try 'grml-debootstrap --help' for more information."; eend 1; exit 1 fi +eval set -- "$_opt_temp" + +while :; do + case "$1" in + + # == Bootstrap options + --mirror|-m) # Mirror which should be used for apt-get/aptitude + shift; _opt_mirror="$1" + ;; + --iso|-i) # Mountpoint where a Debian ISO is mounted to + shift; _opt_iso="$1" + ;; + --release|-r) # Release of new Debian system + shift; _opt_release="$1" + ;; + --target|-t) # Target partition (/dev/...) or directory + shift; _opt_target="$1" + ;; + --vm) # Virtual machine image (no file) + _opt_vm="T" + ;; + --vmfile) # Virtual machine file + _opt_vmfile="T" + ;; + --vmsize) # size of Virtual machine file + shift; _opt_vmsize="$1" + ;; + --mntpoint|-p) # Mountpoint used for mounting the target system + shift; _opt_mntpoint="$1" + ;; + --debopt) # Extra parameters passed to the debootstrap command + shift; _opt_debopt="$1" + ;; + --filesystem) # Filesystem that should be used + shift; _opt_filesystem="$1" + ;; + --interactive) # Use interactive mode (frontend) + _opt_interactive=T + ;; + --nodebootstrap) # Skip debootstrap, only do configuration to the target + _opt_nodebootstrap=T + ;; + --nopackages) # Skip installation of packages defined in /etc/debootstrap/packages + _opt_nopackages=T + ;; + --arch) # Target architecutre + shift; _opt_arch="$1" + ;; + # just for backwards compatibility + --insecure) + _opt_insecure=T + ;; + # + + # == Configuration options + --config|-c) # Use specified configuration file, defaults to /etc/debootstrap + shift; _opt_config="$1" + ;; + --confdir|-d) # Place of config files for debootstrap, defaults to /etc/debootstrap + shift; _opt_confdir="$1" + ;; + --packages) # Install packages defined in specified file + shift; _opt_packages="$1" + _opt_packages_set=T + ;; + --debconf) # Pre-seed packages using specified file + shift; _opt_debconf="$1" + _opt_debconf_set=T + ;; + --pre-scripts) # Execute scripts from specified directory (before chroot-scripts). + shift; _opt_pre_scripts="$1" + _opt_pre_scripts_set=T + ;; + --scripts) # Execute scripts from specified directory [NOTE: deprecated, replaced via --post-scripts] + shift; _opt_scripts="$1" + _opt_scripts_set=T + ;; + --post-scripts) # Execute scripts from specified directory + shift; _opt_post_scripts="$1" + _opt_post_scripts_set=T + ;; + --chroot-scripts) # Execute chroot scripts from specified directory + shift; _opt_chroot_scripts="$1" + _opt_chroot_scripts_set=T + ;; + --keep_src_list) # Do not overwrite user provided apt sources.list + _opt_keep_src_list=T + ;; + --hostname) # Hostname of Debian system + shift; _opt_hostname="$1" + ;; + --password) # Use specified password as password for user root + shift; _opt_password="$1" + ;; + --defaultinterfaces) # Install default /etc/network/interfaces + _opt_defaultinterfaces=T + ;; + --nointerfaces) # Skip installation of /etc/network/interfaces + _opt_nointerfaces=T + ;; + --nokernel) # Skip installation of default kernel images + _opt_nokernel=T + ;; + --nopassword) # Skip password dialog + _opt_nopassword=T + ;; + --grmlrepos) # Enable Grml repository + _opt_grmlrepos=T + ;; + --backportrepos) # Enable Debian backports repository + _opt_backportrepos=T + ;; + --bootappend) # Add specified appendline to kernel whilst booting + shift; _opt_bootappend="$1" + ;; + --grub) # Target for grub installation. Use grub syntax for specifying + shift; _opt_grub="$1" + ;; + --efi) # Target for EFI boot installation + shift; _opt_efi="$1" + ;; + --contrib) # Add 'contrib' to list of components + _opt_contrib=T + ;; + --non-free) # Add 'non-free' to list of components + _opt_non_free=T + ;; + --remove-configs) # Drop config files from installed system + _opt_remove_configs=T + ;; + + # == Other options + --verbose|-v) # Increase verbosity + if [ "$_opt_verbose" ]; then + _opt_verbose=$( _opt_verbose + 1 ) + else + _opt_verbose=1 + fi + ;; + --debug) # Execute in debug mode + _opt_debug=T + ;; + --help|-h) # Print usage information and exit + _opt_help=T + ;; + --version|-V) # Show version information and exit + _opt_version=T + ;; + --force) # Do not prompt for user input + _opt_force=T + ;; + --) + shift; break + ;; + *) + eerror "Internal getopt error!"; eend 1 ; exit 1 + ;; + esac + shift +done # == business-logic of command line parameter-processing @@ -663,7 +818,7 @@ prompt_for_mirror() [ $? -eq 0 ] || bailout if [ "$CHOOSE_MIRROR" = 'net' ] ; then - [ -n "$MIRROR" ] || MIRROR='http://httpredir.debian.org/debian' + [ -n "$MIRROR" ] || MIRROR='http://deb.debian.org/debian' MIRROR="$(dialog --stdout --title "${PN}" --inputbox \ "Please enter Debian mirror you would like to use for installing packages." \ 0 0 $MIRROR)" @@ -773,6 +928,7 @@ Do you want to stop now?" 0 0 2>/dev/null } # }}} +# format efi partition {{{ format_efi_partition() { if [ -z "$EFI" ] ; then return 0 @@ -798,6 +954,7 @@ format_efi_partition() { fi fi } +# }}} # check for EFI support or try to enable it {{{ efi_support() { @@ -1132,6 +1289,7 @@ mkfs() { } # }}} +# retrieve ID_FS_UUID {{{ identify_target_uuid() { local device="$1" @@ -1147,7 +1305,9 @@ identify_target_uuid() { return 1 fi } +# }}} +# identify TARGET_UUID {{{ mountpoint_to_blockdevice() { TARGET_UUID='' @@ -1172,6 +1332,7 @@ mountpoint_to_blockdevice() { fi done } +# }}} # modify filesystem settings {{{ tunefs() { @@ -1236,7 +1397,7 @@ prepare_vm() { einfo "Adjusting disk signature to a fixed (non-random) value" MBRTMPFILE=$(mktemp) dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1 - echo -en "\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1 + echo -en "\\x41\\x41\\x41\\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1 dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc eend $? fi @@ -1298,7 +1459,7 @@ finalize_vm() { # Has chroot-script installed GRUB to MBR using grub-install (successfully), already? # chroot-script skips installation for unset ${GRUB} -if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | fgrep -q GRUB; then +if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | grep -Fq GRUB; then einfo "Installing Grub as bootloader." if ! chroot "${MNTPOINT}" dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then @@ -1346,7 +1507,7 @@ fi ewarn "Please note that your system might NOT be able to properly boot." else einfo "Adjusting grub.cfg for successful boot sequence." - sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg + sed -i "s;root=[^ ]\\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg fi umount "${MNTPOINT}"/proc @@ -1599,6 +1760,7 @@ execute_post_scripts() { } # }}} +# unmount mountpoint {{{ try_umount() { local tries=$1 local mountpoint="$2" @@ -1618,6 +1780,7 @@ try_umount() { done return 1 # Tried enough } +# }}} # execute chroot-script {{{ chrootscript() {