From 095f7e14745f34f565d6991c42ae10b3ac0b315d Mon Sep 17 00:00:00 2001 From: WangXiaoPeng Date: Mon, 11 May 2015 23:26:52 -0400 Subject: [PATCH] remove template files kvm.tmpl and service.tmpl for ubuntu diskfull and make them to be a link to compute.tmpl since we did not see the necessary to have sperated template file --- .../share/xcat/install/ubuntu/kvm.tmpl | 139 +---------------- .../share/xcat/install/ubuntu/service.tmpl | 147 +----------------- 2 files changed, 2 insertions(+), 284 deletions(-) mode change 100644 => 120000 xCAT-server/share/xcat/install/ubuntu/kvm.tmpl mode change 100644 => 120000 xCAT-server/share/xcat/install/ubuntu/service.tmpl diff --git a/xCAT-server/share/xcat/install/ubuntu/kvm.tmpl b/xCAT-server/share/xcat/install/ubuntu/kvm.tmpl deleted file mode 100644 index 01c1c74ac..000000000 --- a/xCAT-server/share/xcat/install/ubuntu/kvm.tmpl +++ /dev/null @@ -1,138 +0,0 @@ - -### Localization -d-i debian-installer/locale string en_US -d-i localechooser/supported-locales multiselect en_US.UTF-8 - -# Keyboard Selection -d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/layoutcode string en - -### Network Configuration - -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain -d-i netcfg/wireless_wep string -d-i netcfg/dhcp_timeout string 120 -### Mirror settings -# If you select ftp, the mirror/country string does not need to be set. - -d-i mirror/country string manual -d-i mirror/protocol string http -d-i mirror/http/directory string #INCLUDE_OSIMAGE_PKGDIR# -d-i mirror/http/proxy string - -# Suite to install. -#d-i mirror/suite string testing -# Suite to use for loading installer components (optional). -#d-i mirror/udeb/suite string testing - - -### Partitioning -# This creates a small /boot partition, suitable -# swap, and uses the rest of the space for the root partition: - -d-i partman-auto/method string regular -d-i partman-lvm/device_remove_lvm boolean true -d-i partman-md/device_remove_md boolean true - -#create the /tmp/partitioning based on the uefi or legacy bios -d-i partman/early_command string \ - set -x; \ - rm /tmp/devs-with-boot 2>/dev/null || true; \ - for d in $(list-devices partition); do \ - mkdir -p /tmp/mymount; \ - rc=0; \ - mount $d /tmp/mymount || rc=$?; \ - if [[ $rc -eq 0 ]]; then \ - [[ -d /tmp/mymount/boot ]] && echo $d >>/tmp/devs-with-boot; \ - umount /tmp/mymount; \ - fi \ - done; \ - if [[ -e /tmp/devs-with-boot ]]; then \ - head -n1 /tmp/devs-with-boot | egrep -o '\S+[^0-9]' > /tmp/boot_disk; \ - rm /tmp/devs-with-boot 2>/dev/null || true; \ - else \ - DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*sd[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o 'sd.*$'`; \ - if [[ "$DEV" == "" ]]; then DEV="sda"; fi; \ - echo "/dev/$DEV" > /tmp/boot_disk; \ - fi; \ - debconf-set partman-auto/disk "$(cat /tmp/boot_disk)" -d-i partman-auto/expert_recipe_file string /tmp/partitioning - -# This makes partman automatically partition without confirmation, provided -# that you told it what to do using one of the methods above. - -d-i partman/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - - -### Account setup - -d-i passwd/root-login boolean true -d-i passwd/make-user boolean false - -d-i passwd/root-password-crypted password #CRYPT:passwd:key=system,username=root:password# - -### Clock and time zone setup - -d-i clock-setup/ntp boolean true -d-i clock-setup/ntp-server string #TABLE:site:key=master:value# -d-i clock-setup/utc boolean true -d-i time/zone string #TABLE:site:key=timezone:value# - -### Apt setup - -d-i apt-setup/multiverse boolean false -d-i apt-setup/universe boolean false -d-i apt-setup/backports boolean false -d-i apt-setup/updates boolean false - - -### Boot loader installation - -d-i grub-installer/only_debian boolean true - -### Package selection - -tasksel tasksel/first multiselect standard - -# gawk required for the xCAT scripts to work -# Otherwise it installs mawk, which doesn't work - -d-i pkgsel/include string #INCLUDE_DEFAULT_PKGLIST_PRESEED# - -d-i debian-installer/allow_unauthenticated string true -d-i pkgsel/update-policy select none -d-i pkgsel/updatedb boolean false - -### Finishing up the installation -d-i finish-install/reboot_in_progress note - -### X configuration -xserver-xorg xserver-xorg/autodetect_monitor boolean true - -xserver-xorg xserver-xorg/config/monitor/selection-method \ - select medium - -xserver-xorg xserver-xorg/config/monitor/mode-list \ - select 1024x768 @ 60 Hz - - -d-i preseed/early_command string wget http://`cat /tmp/xcatserver`/install/autoinst/#HOSTNAME#.pre; \ - chmod u+x #HOSTNAME#.pre; \ - ./#HOSTNAME#.pre - -# To workaround the "Unmount partitions that are in use?" question -d-i preseed/early_command string umount /media || true - -d-i preseed/late_command string wget http://`cat /tmp/xcatserver`/install/autoinst/#HOSTNAME#.post; \ - chmod u+x #HOSTNAME#.post; \ - cp ./#HOSTNAME#.post /target/root/post.script; \ - mount -o bind /proc /target/proc -t proc; \ - mount -o bind /dev /target/dev; \ - mount -o bind /dev/pts /target/dev/pts -t devpts; \ - mount -o bind /sys /target/sys; \ - chroot /target /root/post.script - diff --git a/xCAT-server/share/xcat/install/ubuntu/kvm.tmpl b/xCAT-server/share/xcat/install/ubuntu/kvm.tmpl new file mode 120000 index 000000000..9fde7dbaf --- /dev/null +++ b/xCAT-server/share/xcat/install/ubuntu/kvm.tmpl @@ -0,0 +1 @@ +compute.tmpl \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/ubuntu/service.tmpl b/xCAT-server/share/xcat/install/ubuntu/service.tmpl deleted file mode 100644 index 5561fb2e7..000000000 --- a/xCAT-server/share/xcat/install/ubuntu/service.tmpl +++ /dev/null @@ -1,146 +0,0 @@ - -### Localization -d-i debian-installer/locale string en_US -d-i localechooser/supported-locales multiselect en_US.UTF-8 - -# Keyboard Selection -d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/layoutcode string en - -### Network Configuration - -d-i netcfg/get_hostname string unassigned-hostname -d-i netcfg/get_domain string unassigned-domain -d-i netcfg/wireless_wep string -d-i netcfg/dhcp_timeout string 120 -### Mirror settings -# If you select ftp, the mirror/country string does not need to be set. - -#MIRRORSPEC# - -# Suite to install. -#d-i mirror/suite string testing -# Suite to use for loading installer components (optional). -#d-i mirror/udeb/suite string testing - - -# Use the following option to add additional boot parameters for the -# installed system (if supported by the bootloader installer). -# Note: options passed to the installer will be added automatically. -d-i debian-installer/add-kernel-opts string #XCATVAR:PERSKCMDLINE# - -### Partitioning -# This creates a small /boot partition, suitable -# swap, and uses the rest of the space for the root partition: - -d-i partman-auto/method string regular -d-i partman-lvm/device_remove_lvm boolean true -d-i partman-md/device_remove_md boolean true - -#create the /tmp/partitionfile based on the uefi or legacy bios -d-i partman/early_command string \ - set -x; \ - if [ -f /tmp/boot_disk ]; then \ - debconf-set partman-auto/disk "$(cat /tmp/boot_disk)"; \ - exit; \ - fi; \ - rm /tmp/devs-with-boot 2>/dev/null || true; \ - for d in $(list-devices partition); do \ - mkdir -p /tmp/mymount; \ - rc=0; \ - mount $d /tmp/mymount || rc=$?; \ - if [[ $rc -eq 0 ]]; then \ - [[ -d /tmp/mymount/boot ]] && echo $d >>/tmp/devs-with-boot; \ - umount /tmp/mymount; \ - fi \ - done; \ - if [[ -e /tmp/devs-with-boot ]]; then \ - head -n1 /tmp/devs-with-boot | egrep -o '\S+[^0-9]' > /tmp/boot_disk; \ - rm /tmp/devs-with-boot 2>/dev/null || true; \ - else \ - DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*[s|h|v]d[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o '[s|h|v]d.*$'`; \ - if [[ "$DEV" == "" ]]; then DEV="sda"; fi; \ - echo "/dev/$DEV" > /tmp/boot_disk; \ - fi; \ - debconf-set partman-auto/disk "$(cat /tmp/boot_disk)" -d-i partman-auto/expert_recipe_file string /tmp/partitionfile - -# This makes partman automatically partition without confirmation, provided -# that you told it what to do using one of the methods above. - -d-i partman/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - -#XCA_PARTMAN_ADDITIONAL_CFG# - -### Account setup - -d-i passwd/root-login boolean true -d-i passwd/make-user boolean false - -d-i passwd/root-password-crypted password #CRYPT:passwd:key=system,username=root:password# - -### Clock and time zone setup - -d-i clock-setup/ntp boolean true -d-i clock-setup/ntp-server string #TABLE:site:key=master:value# -d-i clock-setup/utc boolean true -d-i time/zone string #TABLE:site:key=timezone:value# - -### Apt setup - -d-i apt-setup/multiverse boolean false -d-i apt-setup/universe boolean false -d-i apt-setup/backports boolean false -d-i apt-setup/updates boolean false - - -### Boot loader installation - -d-i grub-installer/only_debian boolean true - -### Package selection - -tasksel tasksel/first multiselect standard - -# gawk required for the xCAT scripts to work -# Otherwise it installs mawk, which doesn't work - -d-i pkgsel/include string #INCLUDE_DEFAULT_PKGLIST_PRESEED# - -d-i debian-installer/allow_unauthenticated boolean true -d-i pkgsel/update-policy select none -d-i pkgsel/updatedb boolean false - -### Finishing up the installation -d-i finish-install/reboot_in_progress note - -### X configuration -xserver-xorg xserver-xorg/autodetect_monitor boolean true - -xserver-xorg xserver-xorg/config/monitor/selection-method \ - select medium - -xserver-xorg xserver-xorg/config/monitor/mode-list \ - select 1024x768 @ 60 Hz - - -# To workaround the "Unmount partitions that are in use?" question, -# run the "umount /media" after the preseed is read in -d-i preseed/early_command string wget http://`cat /tmp/xcatserver`/install/autoinst/#HOSTNAME#.pre; \ - chmod u+x #HOSTNAME#.pre; \ - ./#HOSTNAME#.pre; \ - umount /media || true - -d-i preseed/late_command string wget http://`cat /tmp/xcatserver`/install/autoinst/#HOSTNAME#.post; \ - chmod u+x #HOSTNAME#.post; \ - cp ./#HOSTNAME#.post /target/root/post.script; \ - mount -o bind /proc /target/proc -t proc; \ - mount -o bind /dev /target/dev; \ - mount -o bind /dev/pts /target/dev/pts -t devpts; \ - mount -o bind /sys /target/sys; \ - chroot /target /root/post.script; \ - cp /target/etc/network/interfaces /etc/network/interfaces - diff --git a/xCAT-server/share/xcat/install/ubuntu/service.tmpl b/xCAT-server/share/xcat/install/ubuntu/service.tmpl new file mode 120000 index 000000000..9fde7dbaf --- /dev/null +++ b/xCAT-server/share/xcat/install/ubuntu/service.tmpl @@ -0,0 +1 @@ +compute.tmpl \ No newline at end of file