customize.sh

@@ -41,8 +41,6 @@ perl -n -i \
     -e "print;" \
     ${ISO}/boot/grub/{grub,loopback}.cfg
 
-sudo install -D -m 0644 files/fallback_dns.conf ${FS}/etc/systemd/resolved.conf.d/fallback_dns.conf
-
 if ! [ "$1" == "skip" ] ; then
 
 # Run the customize-inner.sh script inside the chroot

files/casper.conf

@@ -1,6 +1,6 @@
 export USERNAME="nilm"
 export USERFULLNAME="NILM User"
-export HOST="nilmbuntu-live"
+export HOST="nilmbuntu"
 export BUILD_SYSTEM="Ubuntu"
 export FLAVOUR="NILMbuntu"
 

files/customize-inner.sh

@@ -10,6 +10,7 @@ set -x
 
 # Move stuff to the right places
 install -D -m 0644 files/nilmbuntu.png /usr/share/xfce4/backdrops/nilmbuntu.png
+install -D -m 0644 files/fallback_dns.conf /etc/systemd/resolved.conf.d/fallback_dns.conf
 install -D -m 0644 files/casper.conf /etc/casper.conf
 install -D -m 0644 files/hosts.nilm /etc/hosts.nilm
 
@@ -45,7 +46,6 @@ apt -y install postfix
 # Required packages
 apt -y install \
     python3 \
-    python3-venv \
     python3-pip \
     git \
     build-essential \
@@ -112,7 +112,7 @@ xmlstarlet ed -L -u "//property[@name='image-path']/@value" -v "$BG" $XML
 xmlstarlet ed -L -u "//property[@name='image-style']/@value" -v "3" $XML
 
 # Make Firefox nicer
-install -D -m 0644 files/syspref.js /etc/firefox/syspref.js
+install -D -m 0644 files/syspref.js /etc/hosts.nilm
 
 # Create NILM user.  This should happen after anything that we put in
 # /etc/skel, since files get copied from there.  Note that this user

files/preseed.cfg

@@ -53,6 +53,3 @@ d-i user-setup/allow-password-weak boolean true
 d-i user-setup/force-encrypt-home boolean false
 d-i user-setup/encrypt-home boolean false
 d-i passwd/auto-login boolean true
-
-d-i netcfg/get_hostname seen true
-d-i netcfg/get_hostname string nilmbuntu

run.sh

@@ -47,14 +47,13 @@ set -x
 
 cfg=""
 
-cfg+=" -nodefaults"
 cfg+=" -drive file=${DISK},media=disk,format=raw,if=virtio"
 cfg+=" -enable-kvm"
 cfg+=" -m 2048"
 cfg+=" -usb"
 cfg+=" -device usb-tablet"
-cfg+=" -nic user"
+
-cfg+=" -vga virtio"
+cfg+=" -vga vmware"
 #cfg+=" -vnc :0"
 
 case $boot in