| Message ID | 20220727033739.1752802-1-johannes.schneider@leica-geosystems.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,v3] classes: rootfs-postcommands: autologin root on serial-getty | expand |
On Wed, Jul 27, 2022 at 5:37 AM Johannes Schneider via lists.openembedded.org <johannes.schneider=leica-geosystems.com@lists.openembedded.org> wrote: > > when empty-root-password AND serial-autologin-root are part of the > IMAGE_FEATURES, save some of the developers time by not having to type > the (then still sole) 'root' username on the serial consoleafter each > and every reboot > If this change is accepted, it would be good to have it documented really soon. It is likely to break CIs. Regards, Marta
Hi, what & where would you like to see (as) additional documentation? (-: regards
On Wed, 27 Jul 2022 05:37:39 +0200 "Johannes Schneider via lists.openembedded.org" <johannes.schneider=leica-geosystems.com@lists.openembedded.org> wrote: > when empty-root-password AND serial-autologin-root are part of the > IMAGE_FEATURES, save some of the developers time by not having to type > the (then still sole) 'root' username on the serial consoleafter each s/consoleafter/console after/ > and every reboot > > this is done by inserting '--autologin root' into the command line of > the responsible 'getty' service > > Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com> > --- > meta/classes/core-image.bbclass | 1 + > meta/classes/image.bbclass | 2 +- > meta/classes/rootfs-postcommands.bbclass | 15 +++++++++++++++ > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass > index 84fd3eeb38..6764035729 100644 > --- a/meta/classes/core-image.bbclass > +++ b/meta/classes/core-image.bbclass > @@ -29,6 +29,7 @@ > # - allow-empty-password > # - allow-root-login > # - post-install-logging > +# - serial-autologin-root - with 'empty-root-password': autologin 'root' on the serial console > # - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs > # - dbg-pkgs - debug symbol packages for all installed packages in the rootfs > # - lic-pkgs - license packages for all installed pacakges in the rootfs, requires > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 2139a7e576..fe32cdefd5 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -34,7 +34,7 @@ INHIBIT_DEFAULT_DEPS = "1" > # IMAGE_FEATURES may contain any available package group > IMAGE_FEATURES ?= "" > IMAGE_FEATURES[type] = "list" > -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging overlayfs-etc" > +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login serial-autologin-root post-install-logging overlayfs-etc" > > # Generate companion debugfs? > IMAGE_GEN_DEBUGFS ?= "0" > diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass > index a8a952f31d..65fe74cc5d 100644 > --- a/meta/classes/rootfs-postcommands.bbclass > +++ b/meta/classes/rootfs-postcommands.bbclass > @@ -8,6 +8,9 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb > # Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled > ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}' > > +# Autologin the root user on the serial console, if empty-root-password and serial-autologin-root are active > +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", [ 'empty-root-password', 'serial-autologin-root' ], "serial_autologin_root; ", "",d)}' > + > # Enable postinst logging if debug-tweaks or post-install-logging is enabled > ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' > > @@ -196,6 +199,18 @@ ssh_allow_root_login () { > fi > } > > +# > +# Autologin the 'root' user on the serial terminal, > +# if empty-root-password' AND 'serial-autologin-root are enabled > +# > +serial_autologin_root () { > + if [ -e ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service ]; then > + sed -i '/^\s*ExecStart\b/ s/getty /&--autologin root /' \ > + "${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service" > + fi > +} > + > + Extra empty line. I took you patch for testing with the above fixed, no need to resend just for those. Thanks.
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 84fd3eeb38..6764035729 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -29,6 +29,7 @@ # - allow-empty-password # - allow-root-login # - post-install-logging +# - serial-autologin-root - with 'empty-root-password': autologin 'root' on the serial console # - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs # - dbg-pkgs - debug symbol packages for all installed packages in the rootfs # - lic-pkgs - license packages for all installed pacakges in the rootfs, requires diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2139a7e576..fe32cdefd5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -34,7 +34,7 @@ INHIBIT_DEFAULT_DEPS = "1" # IMAGE_FEATURES may contain any available package group IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging overlayfs-etc" +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs read-only-rootfs-delayed-postinsts stateless-rootfs empty-root-password allow-empty-password allow-root-login serial-autologin-root post-install-logging overlayfs-etc" # Generate companion debugfs? IMAGE_GEN_DEBUGFS ?= "0" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index a8a952f31d..65fe74cc5d 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -8,6 +8,9 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb # Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}' +# Autologin the root user on the serial console, if empty-root-password and serial-autologin-root are active +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", [ 'empty-root-password', 'serial-autologin-root' ], "serial_autologin_root; ", "",d)}' + # Enable postinst logging if debug-tweaks or post-install-logging is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' @@ -196,6 +199,18 @@ ssh_allow_root_login () { fi } +# +# Autologin the 'root' user on the serial terminal, +# if empty-root-password' AND 'serial-autologin-root are enabled +# +serial_autologin_root () { + if [ -e ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service ]; then + sed -i '/^\s*ExecStart\b/ s/getty /&--autologin root /' \ + "${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service" + fi +} + + python sort_passwd () { import rootfspostcommands rootfspostcommands.sort_passwd(d.expand('${IMAGE_ROOTFS}${sysconfdir}'))
when empty-root-password AND serial-autologin-root are part of the IMAGE_FEATURES, save some of the developers time by not having to type the (then still sole) 'root' username on the serial consoleafter each and every reboot this is done by inserting '--autologin root' into the command line of the responsible 'getty' service Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com> --- meta/classes/core-image.bbclass | 1 + meta/classes/image.bbclass | 2 +- meta/classes/rootfs-postcommands.bbclass | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)