From d445a64bd0d05a3b2291988bffcd284dc936d3ac Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@honeydew.bjdweck.com>
Date: Sun, 22 Nov 2020 10:04:11 +0000
Subject: [PATCH] configured for DHCP and local preseed.cfg

---
 .gitignore           |  8 ++++++++
 create-iso.sh        | 21 +++++++++++----------
 preseed.cfg.template | 22 +++++++++++-----------
 3 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..262ff5d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+grub.backup
+ubuntu-*
+
+*.iso
+
+config
+
+preseed.cfg
diff --git a/create-iso.sh b/create-iso.sh
index 964263f..7bd869f 100755
--- a/create-iso.sh
+++ b/create-iso.sh
@@ -61,21 +61,22 @@ cp -rT /mnt/ubuntu-overssh-iso $PROJECTPATH/ubuntu-overssh-iso
 cp $PROJECTPATH/preseed.cfg.template $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
 
 # replace vairables
-sed -i 's/timeout 0/timeout 300/g' $PROJECTPATH/ubuntu-overssh-iso/prompt.cfg
-sed -i 's/timeout 0/timeout 300/g' $PROJECTPATH/ubuntu-overssh-iso/isolinux.cfg
+sed -i 's/timeout 0/timeout 150/g' $PROJECTPATH/ubuntu-overssh-iso/prompt.cfg
+sed -i 's/timeout 0/timeout 150/g' $PROJECTPATH/ubuntu-overssh-iso/isolinux.cfg
 
-sed -i "s/INTERFACE_DEV/$INTERFACE_DEV/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
-sed -i "s/INTERFACE_IP/$INTERFACE_IP/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
-sed -i "s/INTERFACE_NAMESERVERS/$INTERFACE_NAMESERVERS/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
-sed -i "s/INTERFACE_NETMASK/$INTERFACE_NETMASK/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
-sed -i "s/INTERFACE_GATEWAY/$INTERFACE_GATEWAY/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/INTERFACE_DEV/$INTERFACE_DEV/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/INTERFACE_IP/$INTERFACE_IP/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/INTERFACE_NAMESERVERS/$INTERFACE_NAMESERVERS/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/INTERFACE_NETMASK/$INTERFACE_NETMASK/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/INTERFACE_GATEWAY/$INTERFACE_GATEWAY/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
 sed -i "s/COUNTRY_LOWER/$COUNTRY_LOWER/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
 sed -i "s/COUNTRY/$COUNTRY/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
-sed -i "s/HOSTNAME/$HOSTNAME/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
-sed -i "s/DOMAIN/$DOMAIN/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/HOSTNAME/$HOSTNAME/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
+#sed -i "s/DOMAIN/$DOMAIN/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
 sed -i "s/PASSWORD/$PASSWORD/g" $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg
 
-sed -i "s#append #append priority=critical auto=true preseed/url=$PRESEED_URL netcfg/hostname=$HOSTNAME netcfg/domain=$DOMAIN interface=$INTERFACE_DEV netcfg/disable_dhcp=true netcfg/get_ipaddress=$INTERFACE_IP netcfg/get_netmask=$INTERFACE_NETMASK netcfg/get_gateway=$INTERFACE_GATEWAY netcfg/get_nameservers=$INTERFACE_NAMESERVERS #g" $PROJECTPATH/ubuntu-overssh-iso/txt.cfg
+sed -i "s#append #append priority=critical auto=true #g" $PROJECTPATH/ubuntu-overssh-iso/txt.cfg
+#sed -i "s#append #append priority=critical auto=true preseed/url=$PRESEED_URL netcfg/hostname=$HOSTNAME netcfg/domain=$DOMAIN interface=$INTERFACE_DEV netcfg/disable_dhcp=true netcfg/get_ipaddress=$INTERFACE_IP netcfg/get_netmask=$INTERFACE_NETMASK netcfg/get_gateway=$INTERFACE_GATEWAY netcfg/get_nameservers=$INTERFACE_NAMESERVERS #g" $PROJECTPATH/ubuntu-overssh-iso/txt.cfg
 
 cp $PROJECTPATH/ubuntu-overssh-iso/preseed.cfg $PROJECTPATH/preseed.cfg
 
diff --git a/preseed.cfg.template b/preseed.cfg.template
index 9f85e81..8376e2c 100644
--- a/preseed.cfg.template
+++ b/preseed.cfg.template
@@ -2,18 +2,18 @@ d-i debian-installer/locale string en_US
 d-i debian-installer/language string en
 d-i debian-installer/country string COUNTRY
 d-i debian-installer/locale string en_US.UTF-8
-d-i netcfg/choose_interface select INTERFACE_DEV
+d-i netcfg/choose_interface select auto
 d-i netcfg/link_wait_timeout string 1
-d-i netcfg/disable_autoconfig boolean true
-d-i netcfg/dhcp_failed note
-d-i netcfg/dhcp_options select Configure network manually
-d-i netcfg/get_ipaddress string INTERFACE_IP
-d-i netcfg/get_netmask string INTERFACE_NETMASK
-d-i netcfg/get_gateway string INTERFACE_GATEWAY
-d-i netcfg/get_nameservers string INTERFACE_NAMESERVERS
-d-i netcfg/confirm_static boolean true
-d-i netcfg/hostname string HOSTNAME
-d-i netcfg/domain string DOMAIN
+#d-i netcfg/disable_autoconfig boolean true
+#d-i netcfg/dhcp_failed note
+#d-i netcfg/dhcp_options select Configure network manually
+#d-i netcfg/get_ipaddress string INTERFACE_IP
+#d-i netcfg/get_netmask string INTERFACE_NETMASK
+#d-i netcfg/get_gateway string INTERFACE_GATEWAY
+#d-i netcfg/get_nameservers string INTERFACE_NAMESERVERS
+#d-i netcfg/confirm_static boolean true
+#d-i netcfg/hostname string HOSTNAME
+#d-i netcfg/domain string DOMAIN
 d-i netcfg/wireless_wep string
 d-i hw-detect/load_firmware boolean true
 d-i anna/choose_modules string network-console