diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt index de9352f..d010b93 100644 --- a/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt +++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt @@ -1,5 +1,6 @@ apt-transport-https bash-completion +bridge-utils build-essential bundler byobu @@ -46,4 +47,5 @@ software-properties-common subversion usbmount vim +vlan wget diff --git a/ubuntu-makevm/Makefile b/ubuntu-makevm/1804/Makefile similarity index 85% rename from ubuntu-makevm/Makefile rename to ubuntu-makevm/1804/Makefile index 5d22c6c..5b51912 100644 --- a/ubuntu-makevm/Makefile +++ b/ubuntu-makevm/1804/Makefile @@ -23,3 +23,7 @@ rcopy: rrun: rcopy ssh -t root@$(HOST) "cd /storage/admin/vms && make reinstall" + +rclean: rcopy + ssh -t root@$(HOST) "cd /storage/admin/vms && make clean" + diff --git a/ubuntu-makevm/install.sh b/ubuntu-makevm/1804/install.sh similarity index 73% rename from ubuntu-makevm/install.sh rename to ubuntu-makevm/1804/install.sh index e22ceab..2e19822 100644 --- a/ubuntu-makevm/install.sh +++ b/ubuntu-makevm/1804/install.sh @@ -1,13 +1,14 @@ #!/bin/bash -#VAR="ubuntu18.04" -VAR="generic" +VAR="ubuntu18.04" +#VAR="generic" virt-install \ --name $VMNAME \ +--cpu host \ --ram 32768 \ ---disk path=$DISK_DIR/$VMNAME.qcow2,size=1000 \ ---vcpus 8 \ +--disk path=$DISK_DIR/$VMNAME.qcow2,format=qcow2,size=1000,cache=writeback \ +--vcpus 16 \ --os-type linux \ --os-variant "$VAR" \ --network bridge=virbr0 \ diff --git a/ubuntu-makevm/preseed.cfg b/ubuntu-makevm/1804/preseed.cfg similarity index 100% rename from ubuntu-makevm/preseed.cfg rename to ubuntu-makevm/1804/preseed.cfg diff --git a/ubuntu-makevm/2004/Makefile b/ubuntu-makevm/2004/Makefile new file mode 100644 index 0000000..fd78c41 --- /dev/null +++ b/ubuntu-makevm/2004/Makefile @@ -0,0 +1,30 @@ +export VMNAME := ubuntu2004 +export DISK_DIR := /storage/scratch/tmp +export THAT_DIR := /storage/admin/vms/2004 +export HOST := las1.local + +.PHONY: clean install reinstall rcopy rrun + +default: remote + +clean: + -virsh destroy $(VMNAME) + -virsh undefine $(VMNAME) + rm -f $(DISK_DIR)/$(VMNAME).qcow2 + +install: + bash install.sh + +reinstall: clean install + +remote: rrun + +rcopy: + rsync -avP ./ root@$(HOST):/$(THAT_DIR)/ + +rrun: rcopy + ssh -t root@$(HOST) "cd /$(THAT_DIR) && make reinstall" + +rclean: rcopy + ssh -t root@$(HOST) "cd /$(THAT_DIR) && make clean" + diff --git a/ubuntu-makevm/2004/install.sh b/ubuntu-makevm/2004/install.sh new file mode 100644 index 0000000..443c925 --- /dev/null +++ b/ubuntu-makevm/2004/install.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +VAR="ubuntu2004" +#VAR="generic" + +virt-install \ +--name $VMNAME \ +--cpu host \ +--ram 32768 \ +--disk path=$DISK_DIR/$VMNAME.qcow2,format=qcow2,size=1000,cache=writeback \ +--vcpus 16 \ +--os-type linux \ +--os-variant auto \ +--network bridge=virbr0 \ +--graphics none \ +--console pty,target_type=serial \ +--initrd-inject=preseed.cfg --extra-args "ks=file:/preseed.cfg" \ +--location 'http://us.archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64/' \ +--extra-args 'console=ttyS0,115200n8 serial' + diff --git a/ubuntu-makevm/2004/preseed.cfg b/ubuntu-makevm/2004/preseed.cfg new file mode 100644 index 0000000..c605366 --- /dev/null +++ b/ubuntu-makevm/2004/preseed.cfg @@ -0,0 +1,413 @@ +d-i debian-installer/locale string en_US +d-i console-setup/ask_detect boolean false +d-i keyboard-configuration/xkb-keymap select us +d-i netcfg/choose_interface select auto +# Any hostname and domain names assigned from dhcp take precedence over +# values set here. However, setting the values still prevents the questions +# from being shown, even if values come from dhcp. +d-i netcfg/get_hostname string unassigned-hostname +d-i netcfg/get_domain string unassigned-domain + +# If you want to force a hostname, regardless of what either the DHCP +# server returns or what the reverse DNS entry for the IP is, uncomment +# and adjust the following line. +d-i netcfg/hostname string testvm + +# Disable that annoying WEP key dialog. +d-i netcfg/wireless_wep string +d-i hw-detect/load_firmware boolean true + +### Mirror settings +# If you select ftp, the mirror/country string does not need to be set. +d-i mirror/protocol string http +d-i mirror/country string manual +d-i mirror/http/hostname string ubuntumirror.app.las1.eeqj.de +d-i mirror/http/directory string /ubuntu +d-i mirror/http/proxy string +d-i apt-setup/security_host string ubuntumirror.app.las1.eeqj.de + +# Alternatively: by default, the installer uses CC.archive.ubuntu.com where +# CC is the ISO-3166-2 code for the selected country. You can preseed this +# so that it does so without asking. +# +# dist: +#d-i mirror/http/mirror select us.archive.ubuntu.com +#d-i mirror/http/mirror select ubuntumirror.app.las1.eeqj.de + +# Suite to install. +d-i mirror/suite string focal +# Suite to use for loading installer components (optional). +#d-i mirror/udeb/suite string stretch +# Components to use for loading installer components (optional). +#d-i mirror/udeb/components multiselect main, restricted + +### Account setup +# Skip creation of a root account (normal user account will be able to +# use sudo). The default is false; preseed this to true if you want to set +# a root password. +d-i passwd/root-login boolean true +# Alternatively, to skip creation of a normal user account. +d-i passwd/make-user boolean false + +# Root password, either in clear text +d-i passwd/root-password password changeme +d-i passwd/root-password-again password changeme +# or encrypted using a crypt(3) hash. +#d-i passwd/root-password-crypted password [crypt(3) hash] + +# To create a normal user account. +#d-i passwd/user-fullname string Ubuntu User +#d-i passwd/username string ubuntu +# Normal user's password, either in clear text +#d-i passwd/user-password password insecure +#d-i passwd/user-password-again password insecure +# or encrypted using a crypt(3) hash. +#d-i passwd/user-password-crypted password [crypt(3) hash] +# Create the first user with the specified UID instead of the default. +#d-i passwd/user-uid string 1010 +# The installer will warn about weak passwords. If you are sure you know +# what you're doing and want to override it, uncomment this. +#d-i user-setup/allow-password-weak boolean true + +# The user account will be added to some standard initial groups. To +# override that, use this. +#d-i passwd/user-default-groups string audio cdrom video + +# Set to true if you want to encrypt the first user's home directory. +d-i user-setup/encrypt-home boolean false + +### Clock and time zone setup +# Controls whether or not the hardware clock is set to UTC. +d-i clock-setup/utc boolean true + +# You may set this to any valid setting for $TZ; see the contents of +# /usr/share/zoneinfo/ for valid values. +d-i time/zone string UTC + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true +# NTP server to use. The default is almost always fine here. +#d-i clock-setup/ntp-server string ntp.example.com + + +### Partitioning +## Partitioning example +# If the system has free space you can choose to only partition that space. +# This is only honoured if partman-auto/method (below) is not set. +# Alternatives: custom, some_device, some_device_crypto, some_device_lvm. +#d-i partman-auto/init_automatically_partition select biggest_free + +# Alternatively, you may specify a disk to partition. If the system has only +# one disk the installer will default to using that, but otherwise the device +# name must be given in traditional, non-devfs format (so e.g. /dev/sda +# and not e.g. /dev/discs/disc0/disc). +# For example, to use the first SCSI/SATA hard disk: +#d-i partman-auto/disk string /dev/sda +# In addition, you'll need to specify the method to use. +# The presently available methods are: +# - regular: use the usual partition types for your architecture +# - lvm: use LVM to partition the disk +# - crypto: use LVM within an encrypted partition +d-i partman-auto/method string lvm + +# If one of the disks that are going to be automatically partitioned +# contains an old LVM configuration, the user will normally receive a +# warning. This can be preseeded away... +d-i partman-lvm/device_remove_lvm boolean true +# The same applies to pre-existing software RAID array: +d-i partman-md/device_remove_md boolean true +# And the same goes for the confirmation to write the lvm partitions. +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +# For LVM partitioning, you can select how much of the volume group to use +# for logical volumes. +#d-i partman-auto-lvm/guided_size string max +#d-i partman-auto-lvm/guided_size string 10GB +#d-i partman-auto-lvm/guided_size string 50% + +# You can choose one of the three predefined partitioning recipes: +# - atomic: all files in one partition +# - home: separate /home partition +# - multi: separate /home, /var, and /tmp partitions +d-i partman-auto/choose_recipe select atomic + +# Or provide a recipe of your own... +# If you have a way to get a recipe file into the d-i environment, you can +# just point at it. +#d-i partman-auto/expert_recipe_file string /hd-media/recipe + +# If not, you can put an entire recipe into the preconfiguration file in one +# (logical) line. This example creates a small /boot partition, suitable +# swap, and uses the rest of the space for the root partition: +#d-i partman-auto/expert_recipe string \ +# boot-root :: \ +# 40 50 100 ext3 \ +# $primary{ } $bootable{ } \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ /boot } \ +# . \ +# 500 10000 1000000000 ext3 \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ / } \ +# . \ +# 64 512 300% linux-swap \ +# method{ swap } format{ } \ +# . + +# If you just want to change the default filesystem from ext3 to something +# else, you can do that without providing a full recipe. +#d-i partman/default_filesystem string ext4 + +# The full recipe format is documented in the file partman-auto-recipe.txt +# included in the 'debian-installer' package or available from D-I source +# repository. This also documents how to specify settings such as file +# system labels, volume group names and which physical devices to include +# in a volume group. + +# This makes partman automatically partition without confirmation, provided +# that you told it what to do using one of the methods above. +d-i partman-partitioning/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 + +## Partitioning using RAID +# The method should be set to "raid". +#d-i partman-auto/method string raid +# Specify the disks to be partitioned. They will all get the same layout, +# so this will only work if the disks are the same size. +#d-i partman-auto/disk string /dev/sda /dev/sdb + +# Next you need to specify the physical partitions that will be used. +#d-i partman-auto/expert_recipe string \ +# multiraid :: \ +# 1000 5000 4000 raid \ +# $primary{ } method{ raid } \ +# . \ +# 64 512 300% raid \ +# method{ raid } \ +# . \ +# 500 10000 1000000000 raid \ +# method{ raid } \ +# . + +# Last you need to specify how the previously defined partitions will be +# used in the RAID setup. Remember to use the correct partition numbers +# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported; +# devices are separated using "#". +# Parameters are: +# \ +# + +#d-i partman-auto-raid/recipe string \ +# 1 2 0 ext3 / \ +# /dev/sda1#/dev/sdb1 \ +# . \ +# 1 2 0 swap - \ +# /dev/sda5#/dev/sdb5 \ +# . \ +# 0 2 0 ext3 /home \ +# /dev/sda6#/dev/sdb6 \ +# . + +# For additional information see the file partman-auto-raid-recipe.txt +# included in the 'debian-installer' package or available from D-I source +# repository. + +# This makes partman automatically partition without confirmation. +d-i partman-md/confirm boolean true +d-i partman-partitioning/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 + +## Controlling how partitions are mounted +# The default is to mount by UUID, but you can also choose "traditional" to +# use traditional device names, or "label" to try filesystem labels before +# falling back to UUIDs. +#d-i partman/mount_style select uuid + +### Base system installation +# Configure a path to the preconfigured base filesystem. This can be used to +# specify a path for the installer to retrieve the filesystem image that will +# be deployed to disk and used as a base system for the installation. +#d-i live-installer/net-image string /install/filesystem.squashfs + +# Configure APT to not install recommended packages by default. Use of this +# option can result in an incomplete system and should only be used by very +# experienced users. +# FIXME i think i want this disabled, but make sure this file works first +#d-i base-installer/install-recommends boolean false + +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +#d-i base-installer/kernel/image string linux-generic + +### Apt setup +# You can choose to install restricted and universe software, or to install +# software from the backports repository. +#d-i apt-setup/restricted boolean true +#d-i apt-setup/universe boolean true +#d-i apt-setup/backports boolean true +# Uncomment this if you don't want to use a network mirror. +#d-i apt-setup/use_mirror boolean false +# Select which update services to use; define the mirrors to be used. +# Values shown below are the normal defaults. +#d-i apt-setup/services-select multiselect security +#d-i apt-setup/security_host string security.ubuntu.com +#d-i apt-setup/security_path string /ubuntu + +# Additional repositories, local[0-9] available +#d-i apt-setup/local0/repository string \ +# http://local.server/ubuntu stretch main +#d-i apt-setup/local0/comment string local server +# Enable deb-src lines +#d-i apt-setup/local0/source boolean true +# URL to the public key of the local repository; you must provide a key or +# apt will complain about the unauthenticated repository and so the +# sources.list line will be left commented out +#d-i apt-setup/local0/key string http://local.server/key + +# By default the installer requires that repositories be authenticated +# using a known gpg key. This setting can be used to disable that +# authentication. Warning: Insecure, not recommended. +#d-i debian-installer/allow_unauthenticated boolean true + +# Uncomment this to add multiarch configuration for i386 +#d-i apt-setup/multiarch string i386 + + +### Package selection +#tasksel tasksel/first multiselect ubuntu-server +tasksel tasksel/first multiselect ubuntu-minimal +#tasksel tasksel/first multiselect lamp-server, print-server +#tasksel tasksel/first multiselect kubuntu-desktop + +# Individual additional packages to install +d-i pkgsel/include string openssh-server ca-certificates curl +# Whether to upgrade packages after debootstrap. +# Allowed values: none, safe-upgrade, full-upgrade +#d-i pkgsel/upgrade select none + +# Language pack selection +#d-i pkgsel/language-packs multiselect de, en, zh + +# Policy for applying updates. May be "none" (no automatic updates), +# "unattended-upgrades" (install security updates automatically), or +# "landscape" (manage system with Landscape). +#d-i pkgsel/update-policy select none + +# Some versions of the installer can report back on what software you have +# installed, and what software you use. The default is not to report back, +# but sending reports helps the project determine what software is most +# popular and include it on CDs. +#popularity-contest popularity-contest/participate boolean false + +# By default, the system's locate database will be updated after the +# installer has finished installing most packages. This may take a while, so +# if you don't want it, you can set this to "false" to turn it off. +#d-i pkgsel/updatedb boolean true + +### Boot loader installation +# Grub is the default boot loader (for x86). If you want lilo installed +# instead, uncomment this: +#d-i grub-installer/skip boolean true +# To also skip installing lilo, and install no bootloader, uncomment this +# too: +#d-i lilo-installer/skip boolean true + + +# This is fairly safe to set, it makes grub install automatically to the MBR +# if no other operating system is detected on the machine. +d-i grub-installer/only_debian boolean true + +# This one makes grub-installer install to the MBR if it also finds some other +# OS, which is less safe as it might not be able to boot that other OS. +d-i grub-installer/with_other_os boolean true + +# Due notably to potential USB sticks, the location of the MBR can not be +# determined safely in general, so this needs to be specified: +#d-i grub-installer/bootdev string /dev/sda +# To install to the first device (assuming it is not a USB stick): +#d-i grub-installer/bootdev string default + +# Alternatively, if you want to install to a location other than the mbr, +# uncomment and edit these lines: +#d-i grub-installer/only_debian boolean false +#d-i grub-installer/with_other_os boolean false +#d-i grub-installer/bootdev string (hd0,1) +# To install grub to multiple disks: +#d-i grub-installer/bootdev string (hd0,1) (hd1,1) (hd2,1) + +# Optional password for grub, either in clear text +#d-i grub-installer/password password r00tme +#d-i grub-installer/password-again password r00tme +# or encrypted using an MD5 hash, see grub-md5-crypt(8). +#d-i grub-installer/password-crypted password [MD5 hash] + +# 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 nousb + +### Finishing up the installation +# During installations from serial console, the regular virtual consoles +# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next +# line to prevent this. +#d-i finish-install/keep-consoles boolean true + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + +# This will prevent the installer from ejecting the CD during the reboot, +# which is useful in some situations. +#d-i cdrom-detect/eject boolean false + +# This is how to make the installer shutdown when finished, but not +# reboot into the installed system. +#d-i debian-installer/exit/halt boolean true +# This will power off the machine instead of just halting it. +#d-i debian-installer/exit/poweroff boolean true + +### Preseeding other packages +# Depending on what software you choose to install, or if things go wrong +# during the installation process, it's possible that other questions may +# be asked. You can preseed those too, of course. To get a list of every +# possible question that could be asked during an install, do an +# installation, and then run these commands: +# debconf-get-selections --installer > file +# debconf-get-selections >> file + + +#### Advanced options +### Running custom commands during the installation +## i386 Preseed Example +# d-i preseeding is inherently not secure. Nothing in the installer checks +# for attempts at buffer overflows or other exploits of the values of a +# preconfiguration file like this one. Only use preconfiguration files from +# trusted locations! To drive that home, and because it's generally useful, +# here's a way to run any shell command you'd like inside the installer, +# automatically. + +# This first command is run as early as possible, just after +# preseeding is read. +#d-i preseed/early_command string anna-install some-udeb +# This command is run immediately before the partitioner starts. It may be +# useful to apply dynamic partitioner preseeding that depends on the state +# of the disks (which may not be visible when preseed/early_command runs). +#d-i partman/early_command \ +# string debconf-set partman-auto/disk "$(list-devices disk | head -n1)" +# This command is run just before the install finishes, but when there is +# still a usable /target directory. You can chroot to /target and use it +# directly, or use the apt-install and in-target commands to easily install +# packages and run commands in the target system. +#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh + + +# some extra commands to set up SSH key access +d-i preseed/late_command string in-target mkdir /root/.ssh ; \ + in-target sh -c 'curl -sf https://sneak.cloud/authorized_keys >> /root/.ssh/authorized_keys' ; \ + in-target systemctl enable serial-getty@ttyS0.service ;