equal
deleted
inserted
replaced
271 USER_GROUPS=( cdrom sudo adm ) |
271 USER_GROUPS=( cdrom sudo adm ) |
272 |
272 |
273 ### Paths |
273 ### Paths |
274 ## Installation image |
274 ## Installation image |
275 # Original Debian Installer image (iso) |
275 # Original Debian Installer image (iso) |
276 BASE_INSTALLER_VERSION="6.0.4" |
276 BASE_INSTALLER_VERSION="6.0.5" |
277 BASE_INSTALLER_NAME="debian-${BASE_INSTALLER_VERSION}-amd64" |
277 BASE_INSTALLER_NAME="debian-${BASE_INSTALLER_VERSION}-amd64" |
278 BASE_INSTALLER_ISO="iso/${BASE_INSTALLER_NAME}-netinst.iso" |
278 BASE_INSTALLER_ISO="iso/${BASE_INSTALLER_NAME}-netinst.iso" |
279 BASE_INSTALLER_TREE="images/$BASE_INSTALLER_NAME" |
279 BASE_INSTALLER_TREE="images/$BASE_INSTALLER_NAME" |
280 BASE_INSTALLER_FLAG="${BASE_INSTALLER_TREE}.unpacked" |
280 BASE_INSTALLER_FLAG="${BASE_INSTALLER_TREE}.unpacked" |
281 |
281 |
528 END |
528 END |
529 |
529 |
530 # Kernel boot args (overrides those generated by installer) - default boot option uses args + args_default |
530 # Kernel boot args (overrides those generated by installer) - default boot option uses args + args_default |
531 BOOT_KERNEL_ARGS_DEFAULT="quiet" |
531 BOOT_KERNEL_ARGS_DEFAULT="quiet" |
532 BOOT_KERNEL_ARGS="${BOOT_KERNEL_CONSOLE}" |
532 BOOT_KERNEL_ARGS="${BOOT_KERNEL_CONSOLE}" |
|
533 |
|
534 ## Hotplug modules |
|
535 log_info "Configure acpi/pci hotplug" |
|
536 |
|
537 modules=/etc/modules |
|
538 module='acpihp' |
|
539 |
|
540 preseed_script '20-hotplug-modules' <<END |
|
541 in-target grep -q $module $modules || echo " |
|
542 # KVM virtio hotplug |
|
543 $module" >> $modules |
|
544 END |
533 |
545 |
534 ### Postprocess preseed data |
546 ### Postprocess preseed data |
535 ## Preseed / config files |
547 ## Preseed / config files |
536 |
548 |
537 # copy at end of install |
549 # copy at end of install |