pkvlm: comparison pkvlm-create

equal deleted inserted replaced

-:e3893b949972
+:d74646c0b5dd
 define_opt  bridge      br-lan
 define_opt  dns_domain  paivola.fi
 define_opt  ip
 define_opt  puppet
 define_opt  puppet_master   puppet
+define_opt  serial_console
 log_info "Processing ${#@} parameters:"
 for param in "$@"; do
 name=${param%=*}
 value=${param##*=}
 DISK_NAME=$opt_disk_lv
 # Path to disk block device
 DISK_PATH=/dev/mapper/${DISK_VG}-${DISK_NAME}
 GUEST_DISK_BUS=$opt_disk_bus
+## Serial
+# Serial console?
+# XXX: hardcoded as ttyS0
+case x"$opt_serial_console" in
+#    xtty*)  SERIAL_CONSOLE="$opt_serial_console" ;;
+x)       SERIAL_CONSOLE=     ;;
+x*)     SERIAL_CONSOLE="ttyS0" ;;
+esac
 ### Preseed content
 GUEST_DISK=$opt_guest_disk
 ## Network
 USER_GROUPS=( cdrom sudo adm )
 ## Misc
 PACKAGE_INCLUDES=( sudo screen vim )
 PRESEED_LATE_COMMANDS=( )
+PRESEED_LATE_COMMANDS_END=( )
 PRESEED_INCLUDES=( 'passwords.cfg' 'host.cfg' )
+function preseed_late_commands () {
+PRESEED_LATE_COMMANDS=( "${PRESEED_LATE_COMMANDS[@]:-}" "$@" )
+}
+# XXX: ordering?
+function preseed_late_commands_end () {
+PRESEED_LATE_COMMANDS_END=( "${PRESEED_LATE_COMMANDS_END[@]:-}" "$@" )
+}
 ### Extra
 ## Puppet
 if [ $opt_puppet ]; then
 # XXX: we use files in preseed/files/..., should modularize those
 PUPPET_MASTER="${opt_puppet_master}"
 PACKAGE_INCLUDES=( ${PACKAGE_INCLUDES[@]} ${PUPPET_PACKAGES[@]} )
-PRESEED_LATE_COMMANDS=( "${PRESEED_LATE_COMMANDS[@]:-}" "${PUPPET_COMMANDS[@]:-}" )
-fi
+[ "${PUPPET_COMMANDS[@]:-}" ] && preseed_late_commands "${PUPPET_COMMANDS[@]}"
+fi
+## Configure GRUB, via preseed/files: /etc/default/grub
+# Kernel commandline/grub terminal
+# The last console=... for kernel is used as /dev/console, i.e. init output
+if [ $SERIAL_CONSOLE ]; then
+BOOT_KERNEL_CONSOLE="console=${SERIAL_CONSOLE} console=tty0"
+BOOT_GRUB_TERMINAL="console serial"
+# re-generate grub.cfg
+preseed_late_commands_end "in-target update-grub"
+# Configure /etc/inittab for serial console
+preseed_late_commands "in-target sed -i 's/#T0/T0/' /etc/inittab"
+else
+BOOT_KERNEL_CONSOLE=""
+BOOT_GRUB_TERMINAL="console"
+fi
+# Kernel boot args (overrides those generated by installer) - default boot option uses args + args_default
+BOOT_KERNEL_ARGS_DEFAULT="quiet"
+BOOT_KERNEL_ARGS="${BOOT_KERNEL_CONSOLE}"
 ### Installer setup
 ## Installation image
 # Original Debian Installer image (iso)
 INSTALLER_NAME="debian-6.0.3-amd64"
 # Checksum of target preseed.cfg
 PRESEED_CHECKSUM= # set later
 ## Configs
+# template source
 CONF_FILES_SOURCE='preseed/files'
+# template output into install tree
 CONF_FILES_TARGET_NAME='preseed-files'
 CONF_FILES_TARGET="${INSTALL_TREE}/${CONF_FILES_TARGET_NAME}"
+# paths within installer runtime
 CONF_FILES_CP_SRC="${PRESEED_MOUNT}/${CONF_FILES_TARGET_NAME}"
 CONF_FILES_CP_DST='/target'
-PRESEED_LATE_COMMANDS=( "${PRESEED_LATE_COMMANDS[@]:-}" \
+# copy at end of install
-"cp -rd -- ${CONF_FILES_CP_SRC}/* ${CONF_FILES_CP_DST}"  \
+preseed_late_commands "cp -rd -- ${CONF_FILES_CP_SRC}/* ${CONF_FILES_CP_DST}"
-)
 # Additional files to copy
 PRESEED_INCLUDE_FILES=( $(for preseed in ${PRESEED_INCLUDES[@]}; do echo "${PRESEED_SOURCE_DIR}/${preseed}"; done) )
 #PRESEED_INCLUDE_FILES=("preseed/passwords.cfg" "preseed/host.cfg")
 # preseed.cfg 'includes' line
 PRESEED_INCLUDE=${PRESEED_INCLUDES[@]}
 # preseed command execution
-PRESEED_LATE_COMMAND=$(for cmd in "${PRESEED_LATE_COMMANDS[@]}"; do if [ "$cmd" ]; then echo -n "$cmd;" $'\\\n    '; fi; done; echo true)
+PRESEED_LATE_COMMAND=$(for cmd in "${PRESEED_LATE_COMMANDS[@]}" "${PRESEED_LATE_COMMANDS_END[@]:-}"; do if [ "$cmd" ]; then echo -n "$cmd;" $'\\\n    '; fi; done; echo true)
 ## Isolinux
 # Source for install tree isolinux file
 PRESEED_ISOLINUX="${PRESEED_SOURCE_DIR}/isolinux.cfg"
-# XXX: automagics? :)
+# Automagics for serial boot :)
 #      virt-install assumes we have an X $DISPLAY if given --vnc
 #      but we also want to enable the serial console...
 #      d-i automagically configures the serial boot/login console, but only if the installer is run under serial...
 #      we want to have both :(
-if [ $DISPLAY ]; then
+if [ ${DISPLAY:-} ]; then
 INSTALL_BOOT_CONSOLE=""
 else
 INSTALL_BOOT_CONSOLE="console=ttyS0"
 fi
-# installer boot args
+# isolinux installer boot args
-INSTALL_BOOT_ARGS="auto=true priority=critical preseed/file=${PRESEED_MOUNT}/${PRESEED_NAME} preseed/file/checksum=${PRESEED_CHECKSUM} -- quiet ${INSTALL_BOOT_CONSOLE}"
+INSTALL_BOOT_ARGS="auto=true priority=critical preseed/file=${PRESEED_MOUNT}/${PRESEED_NAME} preseed/file/checksum=${PRESEED_CHECKSUM} -- ${INSTALL_BOOT_CONSOLE} quiet"
 ### External progs
 ## Bootable .iso for Debian isolinux-based installer CDs
 GENISOIMAGE=/usr/bin/genisoimage
 GENISOIMAGE_OPTS="-r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b isolinux/isolinux.bin -c isolinux/boot.cat"
 CPUs:       $GUEST_VCPUS
 RAM:        $GUEST_RAM
 OS:         $GUEST_OS_VARIANT
 Disk:       $GUEST_DISK
+Boot:
+Serial console: $SERIAL_CONSOLE
+Grub terminal:  $BOOT_GRUB_TERMINAL
+Kernel args:    $BOOT_KERNEL_ARGS ($BOOT_KERNEL_ARGS_DEFAULT)
 Disk:
 Method:     LVM
 Size:       $DISK_SIZE
 LVM:
 --ram $(expand_MB $GUEST_RAM) --vcpus $GUEST_VCPUS \
 --cdrom "$INSTALL_ISO" \
 --os-variant $GUEST_OS_VARIANT \
 --disk path=$DISK_PATH,bus=$GUEST_DISK_BUS \
 --network bridge:$NET_BRIDGE \
---vnc \
 --virt-type $LIBVIRT_TYPE \
 --accelerate --hvm \
+--vnc \
 --serial pty
 fi

changeset 16	d74646c0b5dd
parent 15	e3893b949972
child 18	65301be81959