Compare commits

..

No commits in common. "f1c7ee2323a8c53937d11290b9c1a4b0deef4e14" and "bc8807ae7d96e69ddfe4255ae4c661af2d9864db" have entirely different histories.

3 changed files with 1 additions and 10 deletions

View File

@ -41,9 +41,6 @@ perl -n -i \
-e "print;" \ -e "print;" \
${ISO}/boot/grub/{grub,loopback}.cfg ${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 sudo install -D -m 0644 files/fallback_dns.conf ${FS}/etc/systemd/resolved.conf.d/fallback_dns.conf
if ! [ "$1" == "skip" ] ; then if ! [ "$1" == "skip" ] ; then

View File

@ -13,9 +13,6 @@ 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/casper.conf /etc/casper.conf
install -D -m 0644 files/hosts.nilm /etc/hosts.nilm 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) # Copy hosts for now (although it will get overwritten at boot)
cat /etc/hosts.nilm >> /etc/hosts cat /etc/hosts.nilm >> /etc/hosts
@ -70,9 +67,7 @@ apt -y install \
firefox \ firefox \
flashrom \ flashrom \
gddrescue \ gddrescue \
git \
gnuplot \ gnuplot \
gparted \
help2man \ help2man \
ipython3 \ ipython3 \
libnewlib-arm-none-eabi \ libnewlib-arm-none-eabi \

3
run.sh
View File

@ -55,14 +55,13 @@ cfg+=" -usb"
cfg+=" -device usb-tablet" cfg+=" -device usb-tablet"
cfg+=" -nic user" cfg+=" -nic user"
cfg+=" -vga virtio" cfg+=" -vga virtio"
cfg+=" -k en-us"
#cfg+=" -vnc :0" #cfg+=" -vnc :0"
case $boot in case $boot in
c) c)
echo "booting CD with empty disk" echo "booting CD with empty disk"
rm -f ${DISK} rm -f ${DISK}
dd if=/dev/zero "of=${DISK}" bs=1M count=0 seek=24576 dd if=/dev/zero "of=${DISK}" bs=1M count=0 seek=30720
cfg+=" -drive file=${iso},media=cdrom,if=none,id=cd" cfg+=" -drive file=${iso},media=cdrom,if=none,id=cd"
cfg+=" -device virtio-scsi-pci -device scsi-cd,drive=cd" cfg+=" -device virtio-scsi-pci -device scsi-cd,drive=cd"
cfg+=" -boot d" cfg+=" -boot d"