Reduce VM disk size

README.md

@@ -1,15 +1,18 @@
+Nilmbuntu
+=========
+
 Tools to customize an Ubuntu Live CD.  Many parts of this will end up
 being version-specific.  The host machine must be running systemd,
 since the image is executed inside a systemd-nspawn container.
 
-Set up host machine, which must be running a recent systemd:
+Set up host machine:
 
     sudo apt install squashfs-tools xorriso isolinux systemd-container iptables
     sudo systemctl start systemd-networkd
 
 Choose a config:
 
-  export BUILD_CONFIG=16.04
+    export BUILD_CONFIG=20.04.1
 
 Download and extract the original ISO:
 
@@ -39,11 +42,3 @@ Boot QEMU with the same HDD image as above, to test an "installed" system:
 Remove everything but the ISOs:
 
     ./cleanup.sh
-
-Notes:
-
-- A more proper way to build a distro from scratch would be something
-  like one of these, except that they're out of date:
-
-    http://www.mythbuntu.org/development/developer-cheatsheet (2010)
-    https://github.com/squibbylinux/squibby-build (2012)

buildiso.sh

@@ -15,27 +15,21 @@ fi
 set -x
 set -e
 
-INITRD=${FS}/initrd.img
+INITRD=${FS}/boot/initrd.img
-VMLINUZ=$(readlink -f ${FS}/vmlinuz)
+VMLINUZ=${FS}/boot/vmlinuz
-VMLINUZ_EFI=${VMLINUZ}.efi.signed
 
 if ! [ "$1" == "justiso" ] ; then
 
-
+    if ! [ -r ${INITRD} -a -r ${VMLINUZ} ] ; then
-    if ! [ -r ${INITRD} -a -r ${VMLINUZ} -a -r ${VMLINUZ_EFI} ] ; then
         set +x
         echo "== Missing kernel and/or initrd.  Either upgrade or reinstall"
         echo "== the kernel inside the image to get the right files."
         exit 1
     fi
 
-    # Recompress initrd if changed
+    # Copy kernel and initrd
-    if [ ${INITRD} -nt ${ISO}/casper/initrd.lz ] ; then
+    cp ${INITRD} ${ISO}/casper/initrd
-        sh -c "zcat ${INITRD} | lzma > ${ISO}/casper/initrd.lz"
-    fi
-    # Get kernel and signed EFI kernel
     cp ${VMLINUZ} ${ISO}/casper/vmlinuz
-    cp ${VMLINUZ_EFI} ${ISO}/casper/vmlinuz.efi
 
     # manifests
     chmod +w ${ISO}/casper/filesystem.manifest
@@ -51,7 +45,7 @@ if ! [ "$1" == "justiso" ] ; then
 fi
 
 # md5sums
-rm -f md5sum.txt
+rm -f ${ISO}/md5sum.txt
 find ${ISO} -type f -print0 \
     | xargs -0 md5sum \
     | sed -e "s, ${ISO}, .," \

config

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -z "$BUILD_CONFIG" ] ; then
-    export BUILD_CONFIG=16.04.1
+    export BUILD_CONFIG=20.04.1
     echo "No BUILD_CONFIG set -- assuming $BUILD_CONFIG"
 fi
 

config-20.04.1

@@ -1,7 +1,7 @@
 # -*- sh -*-
 
 # output image
-VERSION="16.04.1"
+VERSION="20.04.1"
 OUTPUT="nilmbuntu-${VERSION}.iso"
 
 # original ISO

customize-inner.sh

@@ -1,221 +0,0 @@
-#!/bin/bash
-
-if [ "$IN_CHROOT" != "1" ] ; then
-    echo This is supposed to run inside the chroot, oops
-    exit 1
-fi
-
-set -e
-set -x
-
-# Set up live username and hostname
-cat >/etc/casper.conf <<"EOF"
-export USERNAME="nilm"
-export USERFULLNAME="NILM User"
-export HOST="nilmbuntu"
-export BUILD_SYSTEM="Ubuntu"
-export FLAVOUR="NILMbuntu"
-
-# Do the inital user setup even though UID 1000 already exists.
-# This also needs to be set in /etc/environment, for ubiquity,
-# but we do that in preseed/early_command so that it only shows
-# up in the LiveCD image.
-export OVERRIDE_SYSTEM_USER=true
-EOF
-
-# Set up NILM-specific stuff to get added to /etc/hosts after installation
-cat >/etc/hosts.nilm <<"EOF"
-127.0.2.1 nilm.primary
-127.0.2.2 nilm.secondary
-EOF
-# And copy it for now (although it will get overwritten at boot)
-cat /etc/hosts.nilm >> /etc/hosts
-
-# Upgrade packages
-apt update
-apt -y dist-upgrade
-apt -y --purge autoremove
-
-# Remove old kernels, and reinstall the latest one (to make sure
-# it's present in /boot)
-LATEST_KERNEL=$(ls --sort=version /lib/modules/ | tail -n 1)
-for VER in $(ls --sort=version /lib/modules/) ; do
-    if [ $VER != $LATEST_KERNEL ] ; then
-        apt -y --purge remove "linux-.*$VER"
-    fi
-done
-apt -y --reinstall install linux-{,signed-}image-${LATEST_KERNEL}
-
-# Disable upgrade popups
-sed -i -s -e 's/Prompt=.*/Prompt=never/g' \
-    /etc/update-manager/release-upgrades || true
-
-# Set up & install postfix for local mail delivery
-debconf-set-selections <<"EOF"
-postfix postfix/mailname string localdomain
-postfix postfix/main_mailer_type select Local only
-EOF
-apt -y install postfix
-
-# Required packages
-apt -y install \
-    python3 \
-    python2.7 \
-    python2.7-dev \
-    python-setuptools \
-    python-pip \
-    cython \
-    git \
-    build-essential \
-    python-cherrypy3 \
-    python-decorator \
-    python-simplejson \
-    python-requests \
-    python-dateutil \
-    python-tz \
-    python-progressbar \
-    python-psutil \
-    python-numpy \
-    python-nose \
-    python-coverage \
-    apache2 \
-    libapache2-mod-wsgi \
-    python-scipy \
-    python-daemon
-
-# Install other useful stuff
-apt -y install \
-    adb \
-    avrdude \
-    chromium-browser \
-    curl \
-    debconf-utils \
-    devscripts \
-    dfu-programmer \
-    dlocate \
-    emacs \
-    emacs-goodies-el \
-    esptool \
-    flashrom \
-    gcc-arm-none-eabi \
-    gcc-avr \
-    gdb-arm-none-eabi \
-    gddrescue \
-    gnuplot \
-    help2man \
-    ipython \
-    libnewlib-arm-none-eabi \
-    libreoffice \
-    libstdc++-arm-none-eabi-newlib \
-    texlive \
-    mailutils \
-    moreutils \
-    mutt \
-    network-manager-openvpn-gnome \
-    octave \
-    octave-missing-functions \
-    octave-signal \
-    openocd \
-    openssh-server \
-    openssl \
-    openvpn \
-    python-matplotlib \
-    screen \
-    sigrok \
-    silversearcher-ag \
-    subversion \
-    tcpdump \
-    zip
-
-# Install the packages required for en_US language support
-# This avoids a prompt and package download at first install
-apt -y install $(/usr/bin/check-language-support -l en_US)
-
-# Set up timezone to America/New_York for the live CD
-ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
-dpkg-reconfigure -f noninteractive tzdata
-
-# Put some default desktop shortcuts in place
-DESKTOP=/etc/skel/Desktop
-mkdir -p $DESKTOP
-cp /usr/share/applications/exo-terminal-emulator.desktop $DESKTOP || true
-cp /usr/share/applications/exo-web-browser.desktop $DESKTOP || true
-chmod +x $DESKTOP/*
-
-# Custom background image (which was already copied in by customize.sh)
-XML=/etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
-BG=/usr/share/xfce4/backdrops/nilmbuntu.png
-apt -y install xmlstarlet
-xmlstarlet ed -L -u "//property[@name='image-path']/@value" -v "$BG" $XML
-xmlstarlet ed -L -u "//property[@name='image-style']/@value" -v "3" $XML
-
-# Configure Firefox with our default homepage (now irrelevant since
-# it won't be the default browser)
-HOMEPAGE="http://www.wattsworth.net/"
-cat >/etc/firefox/syspref.js <<EOF
-pref("browser.startup.homepage", "${HOMEPAGE}");
-pref("extensions.ubufox@ubuntu.com.custom_homepage", "${HOMEPAGE}");
-pref("browser.startup.homepage_override.mstone", "ignore");
-EOF
-
-# Set up Chromium as default browser
-update-alternatives --set x-www-browser /usr/bin/chromium-browser
-update-alternatives --set gnome-www-browser /usr/bin/chromium-browser
-mkdir -p /etc/skel/.config/xfce4
-cat >/etc/skel/.config/xfce4/helpers.rc <<"EOF"
-WebBrowser=chromium-browser
-EOF
-mkdir -p /etc/skel/.local/share/xfce4/helpers
-cat >/etc/skel/.local/share/xfce4/helpers/chromium-browser.desktop <<"EOF"
-[Desktop Entry]
-Version=1.0
-Name=Chromium Web Browser
-X-XFCE-Category=WebBrowser
-X-XFCE-Commands=chromium-browser
-X-XFCE-CommandsWithParameter=chromium-browser "%s"
-Exec=chromium-browser %U
-Type=X-XFCE-Helper
-Icon=chromium-browser
-MimeType=text/html;text/xml;application/xhtml_xml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-EOF
-
-# Make Chromium a little nicer:
-# - No first run
-mkdir -p /etc/skel/.config/chromium/Default
-touch '/etc/skel/.config/chromium/First Run'
-# - Set up some default bookmarks on the bookmark bar
-cat >/etc/skel/.config/chromium/Default/Bookmarks <<"EOF"
-{ "version": 1, "roots": {
-    "other": { "id": "2", "name": "Other bookmarks", "type": "folder",
-               "children": [ ] },
-    "synced": { "id": "3", "name": "Mobile bookmarks", "type": "folder",
-                "children": [ ] },
-    "bookmark_bar": { "id": "1", "name": "Bookmarks bar", "type": "folder",
-                      "children": [ {
-                          "id": "6", "type": "url",
-                          "name": "Wattsworth",
-                          "url": "http://www.wattsworth.net/"
-                      }, {
-                          "id": "7", "type": "url",
-                          "name": "Standalone NILM",
-                          "type": "url",
-                          "url": "http://nilm.primary/"
-                      } ] }
-} }
-EOF
-
-
-# Create NILM user.  This should happen after anything that we put in
-# /etc/skel, since files get copied from there.  Note that this user
-# is the same as what we have in the preseed file and casper.conf
-if ! getent passwd nilm ; then
-   adduser --gecos "NILM User" --disabled-password nilm
-fi
-
-# Make sure locate databases are up-to-date
-/etc/cron.daily/mlocate
-/etc/cron.daily/dlocate
-
-# Make sure initramfs was regenerated with casper changes
-update-initramfs -u

customize.sh

@@ -15,18 +15,19 @@ echo "NILMbuntu $VERSION" > ${ISO}/.disk/info
 
 # Set up preseed file by appending preseed.cfg to the Xubuntu
 # default one
-cat ${ISO}/preseed/xubuntu.seed preseed.cfg > ${ISO}/preseed/nilmbuntu.seed
+cat ${ISO}/preseed/xubuntu.seed files/preseed.cfg > ${ISO}/preseed/nilmbuntu.seed
 
 # Set up isolinux how we want by editing its config
 TRY="Boot ^NILMbuntu ${VERSION}"
-cp splash.png ${ISO}/isolinux/splash.png
+cp files/splash.png ${ISO}/isolinux/splash.png
 perl -n -i \
     -e '$n=1 if /^label/; $n=2 if /^label live-install/; next if $n==2;' \
-    -e "s/menu label.*(Try|NILM).*/menu label $TRY/g;" \
+    -e "s/menu label.*Try Xubuntu without installing/menu label $TRY/g;" \
     -e "s,preseed/.*[.]seed,preseed/nilmbuntu.seed,g;" \
     -e "s/ quiet splash//g;" \
     -e "print;" \
     ${ISO}/isolinux/txt.cfg
+sed -i -s -e "s/^menu margin .*/menu margin 2/g;" ${ISO}/isolinux/menu.cfg
 sed -i -s -e "s/^ui gfxboot/# ui gfxboot/g;" ${ISO}/isolinux/isolinux.cfg
 
 # Set up grub similarly
@@ -34,18 +35,20 @@ TRY="Boot NILMbuntu ${VERSION}"
 perl -n -i \
     -e "next if /menuentry \"Install/../^}$/;" \
     -e "next if /menuentry \"OEM install/../^}$/;" \
-    -e "s/menuentry \"(Try|NILM).*\" \{/menuentry \"${TRY}\" {/g;" \
+    -e "s/Try Xubuntu without installing/${TRY}/g;" \
     -e "s,preseed/.*[.]seed,preseed/nilmbuntu.seed,g;" \
     -e "s/ quiet splash//g;" \
     -e "print;" \
     ${ISO}/boot/grub/{grub,loopback}.cfg
 
+# Prevent some packages from being removed after install
+perl -n -i -e 'print unless /gparted/' ${ISO}/casper/filesystem.manifest-remove
+
+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
-sudo cp nilmbuntu.png ${FS}/usr/share/xfce4/backdrops/nilmbuntu.png
+./enter.sh "cd /root ; files/customize-inner.sh"
-sudo cp customize-inner.sh ${FS}/root/customize-inner.sh
-sudo chmod +x ${FS}/root/customize-inner.sh
-./enter.sh "cd /root ; ./customize-inner.sh"
 
 fi

enter.sh

@@ -13,8 +13,8 @@ fi
 # both).  Instead let's execute systemd-nspawn in a transient systemd
 # unit, then enter it using machinectl.
 
-UNIT=nilmbuntu-run-$VERSION
+UNIT=nilmbuntu-run-$NONPRIV_UID-$VERSION
-MACH=nilmbuntu-$VERSION
+MACH=nilmbuntu-$NONPRIV_UID-$VERSION
 
 setup_networking() {
     # We use a virtual ethernet adapter -- this requires that
@@ -26,10 +26,10 @@ setup_networking() {
 
     # However, the current systemd-networkd from Debian is broken and
     # won't enable masquerading -- so do it manually
-    IFACE=$(ip -4 route list default | head -1 | awk '{print $5}')
+#    IFACE=$(ip -4 route list default | head -1 | awk '{print $5}')
-    echo 1 > /proc/sys/net/ipv4/ip_forward
+#    echo 1 > /proc/sys/net/ipv4/ip_forward
-    iptables -t nat -D POSTROUTING -o $IFACE -j MASQUERADE >/dev/null || true
+#    iptables -t nat -D POSTROUTING -o $IFACE -j MASQUERADE >/dev/null || true
-    iptables -t nat -A POSTROUTING -o $IFACE -j MASQUERADE
+#    iptables -t nat -A POSTROUTING -o $IFACE -j MASQUERADE
 }
 
 kill_container() {
@@ -99,21 +99,14 @@ run() {
 
 set -e
 
+rsync -avP --delete files/ ${FS}/root/files/
+
 setup_networking
 start_container
 
-run "resolvconf --disable-updates"
-run "echo 'nameserver 8.8.8.8' > /run/resolvconf/resolv.conf"
-run "echo '127.0.0.1 localhost' > /etc/hosts"
 run "cat /etc/hosts.nilm >>/etc/hosts 2>/dev/null || true"
 run "hostnamectl --transient set-hostname nilmbuntu"
 
-#run "dbus-uuidgen > /var/lib/dbus/machine-id"
-#run "dpkg-divert --local --rename --add /sbin/initctl"
-#run "ln -sf /bin/true /sbin/initctl"
-#run "dpkg-divert --local --rename --add /usr/sbin/update-grub"
-#run "ln -sf /bin/true /usr/sbin/update-grub"
-
 set +e
 if [ -z "$1" ] ; then
     run "exec bash"
@@ -126,20 +119,15 @@ echo "Cleaning up..."
 # Manually clean up some things that show up after booting an image
 # and installing packages.  This doesn't get everything, but what's
 # left should be fine.
-run "apt-get clean"
+run "apt clean"
+run "dpkg --clear-avail"
 run "> /etc/machine-id"
 run "rm -f /core /boot/grub/grubenv"
 run "rm -f /var/lib/systemd/random-seed"
 run "rm -f /var/lib/ubuntu-drivers-common/last_gfx_boot"
 run "rm -f /var/lib/NetworkManager/*"
 run "rm -f /root/.bash_history"
-
+run "rm -rf /root/files"
-#run "rm /sbin/initctl"
-#run "dpkg-divert --rename --remove /sbin/initctl"
-#run "rm /usr/sbin/update-grub"
-#run "dpkg-divert --rename --remove /usr/sbin/update-grub"
-#run "rm /var/lib/dbus/machine-id"
-#run "> /etc/resolv.conf"
 
 kill_container
 

files/casper.conf

@@ -0,0 +1,18 @@
+export USERNAME="nilm"
+export USERFULLNAME="NILM User"
+export HOST="nilmbuntu-live"
+export BUILD_SYSTEM="Ubuntu"
+export FLAVOUR="NILMbuntu"
+
+# Do the inital user setup even though UID 1000 already exists.
+# This also needs to be set in /etc/environment, for ubiquity,
+# but we do that in preseed/early_command so that it only shows
+# up in the LiveCD image.
+export OVERRIDE_SYSTEM_USER=true
+
+# The ISO has a UUID stored in /.disk/casper-uuid-generic, which
+# won't match the new UUID that update-initramfs put in /conf/uuid.conf,
+# so it won't find the live media at casper boot.
+# Easiest way to avoid this is to set a blank UUID, so that the
+# UUID checks are skipped.
+export UUID=""

files/customize-inner.sh

@@ -0,0 +1,140 @@
+#!/bin/bash
+
+if [ "$IN_CHROOT" != "1" ] ; then
+    echo This is supposed to run inside the chroot, oops
+    exit 1
+fi
+
+set -e
+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/casper.conf /etc/casper.conf
+install -D -m 0644 files/hosts.nilm /etc/hosts.nilm
+
+# Disable apport crash reporting
+sed -i -s -e 's/enabled=1/enabled=0/g' /etc/default/apport
+
+# Copy hosts for now (although it will get overwritten at boot)
+cat /etc/hosts.nilm >> /etc/hosts
+
+# Upgrade packages
+apt update
+apt -y dist-upgrade
+apt -y --purge autoremove
+
+# Remove old kernels, and reinstall the latest one (to make sure
+# it's present in /boot)
+LATEST_KERNEL=$(ls --sort=version /lib/modules/ | tail -n 1)
+for VER in $(ls --sort=version /lib/modules/) ; do
+    if [ $VER != $LATEST_KERNEL ] ; then
+        apt -y --purge remove "linux-.*$VER"
+    fi
+done
+apt -y --reinstall install linux-image-${LATEST_KERNEL}
+
+# Disable upgrade popups
+sed -i -s -e 's/Prompt=.*/Prompt=never/g' \
+    /etc/update-manager/release-upgrades || true
+
+# Set up & install postfix for local mail delivery
+debconf-set-selections <<"EOF"
+postfix postfix/mailname string localdomain
+postfix postfix/main_mailer_type select Local only
+EOF
+apt -y install postfix
+
+# Required packages
+apt -y install \
+    python3 \
+    python3-venv \
+    python3-pip \
+    git \
+    build-essential \
+    apache2 \
+    libapache2-mod-wsgi
+
+# Install other useful stuff
+apt -y install \
+    adb \
+    avrdude \
+    curl \
+    debconf-utils \
+    devscripts \
+    dfu-programmer \
+    dlocate \
+    emacs \
+    emacs-goodies-el \
+    esptool \
+    firefox \
+    flashrom \
+    gddrescue \
+    git \
+    gnuplot \
+    gparted \
+    help2man \
+    ipython3 \
+    libnewlib-arm-none-eabi \
+    libreoffice \
+    libstdc++-arm-none-eabi-newlib \
+    texlive \
+    mailutils \
+    moreutils \
+    mutt \
+    octave \
+    octave-missing-functions \
+    octave-signal \
+    openocd \
+    openssh-server \
+    openssl \
+    openvpn \
+    screen \
+    silversearcher-ag \
+    tcpdump \
+    zip
+
+# Install the packages required for en_US language support
+# This avoids a prompt and package download at first install
+apt -y install $(/usr/bin/check-language-support -l en_US)
+
+# Set up timezone to America/New_York for the live CD
+ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
+dpkg-reconfigure -f noninteractive tzdata
+
+# Put some default desktop shortcuts in place
+DESKTOP=/etc/skel/Desktop
+mkdir -p $DESKTOP
+cp /usr/share/applications/exo-terminal-emulator.desktop $DESKTOP || true
+cp /usr/share/applications/exo-web-browser.desktop $DESKTOP || true
+chmod +x $DESKTOP/*
+
+# Custom background image
+XML=/etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+BG=/usr/share/xfce4/backdrops/nilmbuntu.png
+apt -y install xmlstarlet
+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
+
+# Create NILM user.  This should happen after anything that we put in
+# /etc/skel, since files get copied from there.  Note that this user
+# is the same as what we have in the preseed file and casper.conf
+if ! getent passwd nilm ; then
+   adduser --gecos "NILM User" --disabled-password nilm
+fi
+
+# Make sure locate databases are up-to-date
+/etc/cron.daily/mlocate
+/etc/cron.daily/dlocate
+
+# Make sure initramfs was regenerated with casper changes.
+# Manipulate some config files to avoid host stuff leaking through.
+echo 'RESUME=none' > /etc/initramfs-tools/conf.d/resume
+mv /etc/crypttab /etc/crypttab-old
+CASPER_GENERATE_UUID=1 update-initramfs -u
+rm /etc/initramfs-tools/conf.d/resume
+mv /etc/crypttab-old /etc/crypttab
+

files/fallback_dns.conf

@@ -0,0 +1,2 @@
+[Resolve]
+FallbackDNS=1.1.1.1 9.9.9.10 8.8.8.8 2606:4700:4700::1111 2620:fe::10 2001:4860:4860::8888

files/hosts.nilm

@@ -0,0 +1,2 @@
+127.0.2.1 nilm.primary
+127.0.2.2 nilm.secondary

files/preseed.cfg

@@ -53,3 +53,6 @@ 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

files/syspref.js

@@ -0,0 +1,16 @@
+pref("browser.aboutwelcome.enabled", false);
+pref("datareporting.policy.firstRunURL", "");
+pref("network.trr.mode", 5);
+pref("toolkit.telemetry.reportingpolicy.firstRun", false);
+pref("browser.startup.homepage_override.mstone", "ignore");
+pref("trailhead.firstrun.didSeeAboutWelcome", true);
+
+pref("browser.newtabpage.activity-stream.default.sites","https://www.google.com/");
+pref("browser.newtabpage.activity-stream.feeds.asrouterfeed", false);
+pref("browser.newtabpage.activity-stream.feeds.discoverystreamfeed", false);
+pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
+pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
+pref("browser.newtabpage.activity-stream.feeds.snippets", false);
+pref("browser.newtabpage.activity-stream.section.highlights.includePocket", false);
+pref("browser.newtabpage.pinned", "[{\"url\":\"https://www.wattsworth.net\",\"label\":\"Wattsworth\"},{\"url\":\"http://nilm.primary\",\"label\":\"Local NILM\"}]");
+pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts", false);

run.sh

@@ -47,19 +47,22 @@ set -x
 
 cfg=""
 
+cfg+=" -nodefaults"
 cfg+=" -drive file=${DISK},media=disk,format=raw,if=virtio"
 cfg+=" -enable-kvm"
 cfg+=" -m 2048"
-cfg+=" -usbdevice tablet"
+cfg+=" -usb"
-
+cfg+=" -device usb-tablet"
-cfg+=" -vga vmware"
+cfg+=" -nic user"
+cfg+=" -vga virtio"
+cfg+=" -k en-us"
 #cfg+=" -vnc :0"
 
 case $boot in
     c)
         echo "booting CD with empty disk"
         rm -f ${DISK}
-        dd if=/dev/zero "of=${DISK}" bs=1M count=0 seek=30720
+        dd if=/dev/zero "of=${DISK}" bs=1M count=0 seek=24576
         cfg+=" -drive file=${iso},media=cdrom,if=none,id=cd"
         cfg+=" -device virtio-scsi-pci -device scsi-cd,drive=cd"
         cfg+=" -boot d"