Merge pull request #37 from gardenlinux/no-update

Revert systemd-sysupgrade patches

Author: toanju

features/orabos/exec.config

@@ -16,9 +16,6 @@ IMAGE_VERSION=${BUILDER_VERSION}
 VARIANT_ID=${BUILDER_CNAME%-*}
 EOF
 
-# Add correct root partition to cmdline
-echo "DEVICE=\"LABEL=garden_${BUILDER_VERSION}\"" > /etc/kernel/cmdline.d/000-root.cfg
-
 function create() {
   NAME=$1
   shift
@@ -44,4 +41,4 @@ chmod 0600 /var/lib/nova/.ssh
 
 # limit vnc port autorange to possible kubernetes nodeports
 sed -i 's/#remote_display_port_min = 5900/remote_display_port_min = 32200/' /etc/libvirt/qemu.conf
-sed -i 's/#remote_display_port_max = 65535/remote_display_port_max = 32299/' /etc/libvirt/qemu.conf
+sed -i 's/#remote_display_port_max = 65535/remote_display_port_max = 32299/' /etc/libvirt/qemu.conf

features/orabos/file.exclude

@@ -1,4 +1,2 @@
 /etc/systemd/network/99-default.network
 /etc/systemd/system/systemd-resolved.service.d/wait-for-networkd.conf
-/etc/repart.d/root.conf
-/etc/kernel/cmdline.d/99-no-gpt-auto.cfg

features/orabos/file.include/etc/kernel/cmdline.d/00-default.cfg

@@ -1,4 +1,5 @@
 # DO NOT CHANGE THIS FILE! USE /etc/kernel/cmdline.d
 CMDLINE_LINUX="ro consoleblank=0"
+DEVICE="LABEL=ROOT"
 # WARNING! 0 disables the TIMEOUT
 TIMEOUT=1