Rewrite the kiwi without MicroOS and remove non essential parts

images/microOS/aquarium_root/etc/sudoers.d/aquarium

@@ -0,0 +1 @@
+aquarium ALL=(ALL) NOPASSWD: ALL

images/microOS/config.sh

@@ -7,18 +7,18 @@
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-# 
+#
 #======================================
 # Functions...
 #--------------------------------------
@@ -30,18 +30,17 @@ set -euxo pipefail
 
 echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..."
 
-# Systemd controls the console font now
-echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf
+#======================================
+# Setup baseproduct link
+#--------------------------------------
+suseSetupProduct
 
 #======================================
-# prepare for setting root pw, timezone
+# Activate services
 #--------------------------------------
-echo ** "reset machine settings"
-sed -i 's/^root:[^:]*:/root:*:/' /etc/shadow
-rm -f /etc/machine-id \
-      /var/lib/zypp/AnonymousUniqueId \
-      /var/lib/systemd/random-seed \
-      /var/lib/dbus/machine-id
+suseInsertService sshd
+suseInsertService aquarium
+suseInsertService update_motd
 
 #======================================
 # Specify default systemd target
@@ -58,129 +57,60 @@ suseImportBuildKey
 #--------------------------------------
 baseUpdateSysConfig /etc/sysconfig/network/dhcp DHCLIENT_SET_HOSTNAME yes
 
-#======================================
-# Enable DHCP on eth0
-#--------------------------------------
-cat >/etc/sysconfig/network/ifcfg-eth0 <<EOF
-BOOTPROTO='dhcp'
-STARTMODE='auto'
-EOF
-
 # Add repos from /etc/YaST2/control.xml
 if [ -x /usr/sbin/add-yast-repos ]; then
 	add-yast-repos
 	zypper --non-interactive rm -u live-add-yast-repos
 fi
 
-# Adjust zypp conf
-sed -i 's/^multiversion =.*/multiversion =/g' /etc/zypp/zypp.conf
-
-#=====================================
-# Configure snapper
-#-------------------------------------
-if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
-        echo "creating initial snapper config ..."
-        cp /etc/snapper/config-templates/default /etc/snapper/configs/root
-        baseUpdateSysConfig /etc/sysconfig/snapper SNAPPER_CONFIGS root
-
-	# Adjust parameters
-	sed -i'' 's/^TIMELINE_CREATE=.*$/TIMELINE_CREATE="no"/g' /etc/snapper/configs/root
-	sed -i'' 's/^NUMBER_LIMIT=.*$/NUMBER_LIMIT="2-10"/g' /etc/snapper/configs/root
-	sed -i'' 's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g' /etc/snapper/configs/root
-fi
-
 #=====================================
 # Enable chrony if installed
 #-------------------------------------
 if [ -f /etc/chrony.conf ]; then
 	suseInsertService chronyd
 fi
 
-# The %post script can't edit /etc/fstab sys due to https://github.com/OSInside/kiwi/issues/945
-# so use the kiwi custom hack
-cat >/etc/fstab.script <<"EOF"
-#!/bin/sh
-set -eux
-
-/usr/sbin/setup-fstab-for-overlayfs
-# If /var is on a different partition than /...
-if [ "$(findmnt -snT / -o SOURCE)" != "$(findmnt -snT /var -o SOURCE)" ]; then
-	# ... set options for autoexpanding /var
-	gawk -i inplace '$2 == "/var" { $4 = $4",x-growpart.grow,x-systemd.growfs" } { print $0 }' /etc/fstab
-fi
-EOF
-chmod a+x /etc/fstab.script
-
-# To make x-systemd.growfs work from inside the initrd
-cat >/etc/dracut.conf.d/50-microos-growfs.conf <<"EOF"
-install_items+=" /usr/lib/systemd/systemd-growfs "
-EOF
-
-#======================================
-# Disable recommends on virtual images (keep hardware supplements, see bsc#1089498)
-#--------------------------------------
-sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g' /etc/zypp/zypp.conf
-
-#======================================
-# Disable installing documentation
-#--------------------------------------
-sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp/zypp.conf
-
-#======================================
-# Configure Pine64 specifics
-#--------------------------------------
-if [[ "$kiwi_profiles" == *"Pine64" ]]; then
-    echo 'add_drivers+=" fixed sunxi-mmc axp20x-regulator axp20x-rsb "' > /etc/dracut.conf.d/sunxi_modules.conf
-fi
-
-#======================================
-# Configure Raspberry Pi specifics, unless done by raspberrypi-firmware already (on TW)
-#--------------------------------------
-if [[ "$kiwi_profiles" == *"RaspberryPi"* ]] && ! [[ -e /usr/lib/dracut/dracut.conf.d/raspberrypi_modules.conf ]]; then
-	# Add necessary kernel modules to initrd (will disappear with bsc#1084272)
-	echo 'add_drivers+=" bcm2835_dma dwc2 "' > /etc/dracut.conf.d/raspberrypi_modules.conf
-
-	# Add necessary kernel modules to initrd (will disappear with boo#1162669)
-	echo 'add_drivers+=" pcie-brcmstb "' >> /etc/dracut.conf.d/raspberrypi_modules.conf
-
-	# Work around network issues
-  	cat > /etc/modprobe.d/50-rpi3.conf <<-EOF
-		# Prevent too many page allocations (bsc#1012449)
-		options smsc95xx turbo_mode=N
-	EOF
-
-	cat > /usr/lib/sysctl.d/50-rpi3.conf <<-EOF
-		# Avoid running out of DMA pages for smsc95xx (bsc#1012449)
-		vm.min_free_kbytes = 2048
-	EOF
-fi
 
 #======================================
 # Configure Vagrant specifics
 #--------------------------------------
 if [[ "$kiwi_profiles" == *"Vagrant"* ]]; then
-        # create vagrant user
-        useradd vagrant
-        # allow password-less sudo
-        echo "vagrant ALL=(ALL)NOPASSWD:ALL" > /etc/sudoers.d/vagrant
-        # add vagrant's insecure key
-        mkdir -p /home/vagrant/.ssh
-        chmod 0700 /home/vagrant/.ssh
-        cat > /home/vagrant/.ssh/authorized_keys << EOF
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOF
-        chmod 0600 /home/vagrant/.ssh/authorized_keys
-        chown -R vagrant /home/vagrant
+	# insert the default insecure ssh key from here:
+	# https://github.com/hashicorp/vagrant/blob/master/keys/vagrant.pub
+	useradd vagrant
+	groupadd vagrant
+	usermod -a -G vagrant vagrant
+	mkdir -p /home/vagrant/.ssh/
+	echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > /home/vagrant/.ssh/authorized_keys
+	chmod 0600 /home/vagrant/.ssh/authorized_keys
+	chown -R vagrant:vagrant /home/vagrant/
+	# recommended ssh settings for vagrant boxes
+	echo "UseDNS no" >> /etc/ssh/sshd_config
+	echo "GSSAPIAuthentication no" >> /etc/ssh/sshd_config
+
+	# vagrant assumes that it can sudo without a password
+	# => add the vagrant user to the sudoers list
+	SUDOERS_LINE="vagrant ALL=(ALL) NOPASSWD: ALL"
+	if [ -d /etc/sudoers.d ]; then
+		echo "$SUDOERS_LINE" >| /etc/sudoers.d/vagrant
+		visudo -cf /etc/sudoers.d/vagrant
+		chmod 0440 /etc/sudoers.d/vagrant
+	else
+		echo "$SUDOERS_LINE" >> /etc/sudoers
+		visudo -cf /etc/sudoers
+	fi
+
+	# the default shared folder
+	mkdir -p /vagrant
+	chown -R vagrant:vagrant /vagrant
 fi
 
-if [[ "$kiwi_profiles" == *"Ceph"* ]]; then
-  pip install fastapi uvicorn \
+pip install fastapi uvicorn \
     git+https://github.com/aquarist-labs/aetcd3/@edf633045ce61c7bbac4d4a6ca15b14f8acfe9cd
-  baseInsertService aquarium
-fi
+baseInsertService sshd
+baseInsertService aquarium
 
 # Not compatible with set -e
 baseCleanMount || true
 
 exit 0
-