git submodule update --remote

alvistack · Jul 18, 2021 · 1ebcebf · 1ebcebf
1 parent b882d44
commit 1ebcebf
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/packer/libvirt-33/ks.cfg b/packer/libvirt-33/ks.cfg
@@ -21,7 +21,7 @@ part biosboot --size=1 --fstype=biosboot
 part /boot --size=512 --fstype=ext4
 part swap --size=8192 --fstype=swap
 part / --grow --fstype=ext4
-bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0"
 
 services --enabled=sshd --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
@@ -63,8 +63,8 @@ chown -Rf root:root /etc/sudoers.d
 ssh-keygen -A
 systemctl enable sshd.service
 sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
 grub2-mkconfig -o /boot/grub2/grub.cfg
 dracut -f
 mkdir -p /etc/ssh/sshd_config.d

diff --git a/packer/libvirt-33/packer.json b/packer/libvirt-33/packer.json
@@ -24,7 +24,7 @@
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "vmlinuz initrd=initrd.img inst.stage2=cdrom quite text <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks.cfg <wait5>",
         "<enter>"
       ],

diff --git a/packer/libvirt-34/ks.cfg b/packer/libvirt-34/ks.cfg
@@ -21,7 +21,7 @@ part biosboot --size=1 --fstype=biosboot
 part /boot --size=512 --fstype=ext4
 part swap --size=8192 --fstype=swap
 part / --grow --fstype=ext4
-bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0"
 
 services --enabled=sshd --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
@@ -63,8 +63,8 @@ chown -Rf root:root /etc/sudoers.d
 ssh-keygen -A
 systemctl enable sshd.service
 sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
 grub2-mkconfig -o /boot/grub2/grub.cfg
 dracut -f
 mkdir -p /etc/ssh/sshd_config.d

diff --git a/packer/libvirt-34/packer.json b/packer/libvirt-34/packer.json
@@ -24,7 +24,7 @@
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "vmlinuz initrd=initrd.img inst.stage2=cdrom quite text <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks.cfg <wait5>",
         "<enter>"
       ],

diff --git a/packer/virtualbox-33/ks.cfg b/packer/virtualbox-33/ks.cfg
@@ -21,7 +21,7 @@ part biosboot --size=1 --fstype=biosboot
 part /boot --size=512 --fstype=ext4
 part swap --size=8192 --fstype=swap
 part / --grow --fstype=ext4
-bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0"
 
 services --enabled=sshd --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
@@ -63,8 +63,8 @@ chown -Rf root:root /etc/sudoers.d
 ssh-keygen -A
 systemctl enable sshd.service
 sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
 grub2-mkconfig -o /boot/grub2/grub.cfg
 dracut -f
 mkdir -p /etc/ssh/sshd_config.d

diff --git a/packer/virtualbox-33/packer.json b/packer/virtualbox-33/packer.json
@@ -23,7 +23,7 @@
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "vmlinuz initrd=initrd.img inst.stage2=cdrom quite text <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks.cfg <wait5>",
         "<enter>"
       ],

diff --git a/packer/virtualbox-34/ks.cfg b/packer/virtualbox-34/ks.cfg
@@ -21,7 +21,7 @@ part biosboot --size=1 --fstype=biosboot
 part /boot --size=512 --fstype=ext4
 part swap --size=8192 --fstype=swap
 part / --grow --fstype=ext4
-bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0"
 
 services --enabled=sshd --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 
@@ -63,8 +63,8 @@ chown -Rf root:root /etc/sudoers.d
 ssh-keygen -A
 systemctl enable sshd.service
 sed -ie "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=\"0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
-sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
+sed -ie "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0\"/g" /etc/default/grub
 grub2-mkconfig -o /boot/grub2/grub.cfg
 dracut -f
 mkdir -p /etc/ssh/sshd_config.d

diff --git a/packer/virtualbox-34/packer.json b/packer/virtualbox-34/packer.json
@@ -23,7 +23,7 @@
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
         "vmlinuz initrd=initrd.img inst.stage2=cdrom quite text <wait5>",
-        "net.ifnames=0 biosdevname=0 <wait5>",
+        "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0 <wait5>",
         "inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/ks.cfg <wait5>",
         "<enter>"
       ],

diff --git a/playbooks/tasks/debian.yml b/playbooks/tasks/debian.yml
@@ -48,8 +48,8 @@
     state: "present"
   loop:
     - { option: "GRUB_DEFAULT", value: "0" }
-    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" }
-    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" }
+    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
+    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: update-grub
   command: update-grub

diff --git a/playbooks/tasks/redhat.yml b/playbooks/tasks/redhat.yml
@@ -39,8 +39,8 @@
     state: "present"
   loop:
     - { option: "GRUB_DEFAULT", value: "0" }
-    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" }
-    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" }
+    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
+    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: grub2-mkconfig -o /boot/grub2/grub.cfg
   command: grub2-mkconfig -o /boot/grub2/grub.cfg

diff --git a/playbooks/tasks/suse.yml b/playbooks/tasks/suse.yml
@@ -56,8 +56,8 @@
     state: "present"
   loop:
     - { option: "GRUB_DEFAULT", value: "0" }
-    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0" }
-    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0" }
+    - { option: "GRUB_CMDLINE_LINUX", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
+    - { option: "GRUB_CMDLINE_LINUX_DEFAULT", value: "net.ifnames=0 biosdevname=0 systemd.unified_cgroup_hierarchy=0" }
 
 - name: grub2-mkconfig -o /boot/grub2/grub.cfg
   command: grub2-mkconfig -o /boot/grub2/grub.cfg

diff --git a/roles/sshd b/roles/sshd
+1 −0		CHANGELOG.md
+3 −3		tasks/debian.yml
+0 −0		templates/etc/systemd/system/ssh.service.j2