Changes to images/qemumips/glibc/core-image-full-cmdline (files-in-image.txt): /usr/lib/systemd/system-preset/98-systemd-networkd.preset was added /var/lib/opkg/info/systemd-networkd.conffiles was added /var/lib/opkg/info/systemd-networkd.control was added /var/lib/opkg/info/systemd-networkd.list was added /var/lib/opkg/info/systemd-networkd.postinst was added /var/lib/opkg/info/systemd-networkd.preinst was added /var/lib/opkg/info/systemd-networkd.prerm was added images/qemumips/glibc/core-image-full-cmdline: Changes to /etc/group: --- /etc/group +++ /etc/group @@ -40,9 +40,9 @@ shutdown:x:70: wheel:x:80: users:x:100: -systemd-timesync:x:990: -systemd-resolve:x:991: -systemd-network:x:992: +systemd-network:x:990: +systemd-timesync:x:991: +systemd-resolve:x:992: systemd-journal:x:993: rpcuser:x:994: render:x:995: -- images/qemumips/glibc/core-image-full-cmdline: Changes to /etc/passwd: --- /etc/passwd +++ /etc/passwd @@ -15,9 +15,9 @@ list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin irc:x:39:39:ircd:/run/ircd:/usr/sbin/nologin _apt:x:42:65534::/nonexistent:/usr/sbin/nologin -systemd-timesync:x:993:990::/:/sbin/nologin -systemd-resolve:x:994:991::/:/sbin/nologin -systemd-network:x:995:992::/:/sbin/nologin +systemd-network:x:993:990::/:/sbin/nologin +systemd-timesync:x:994:991::/:/sbin/nologin +systemd-resolve:x:995:992::/:/sbin/nologin rpcuser:x:996:994::/var/lib/nfs:/bin/false rpc:x:997:997::/:/bin/false sshd:x:998:998::/var/run/sshd:/bin/false -- Changes to images/qemumips/glibc/core-image-full-cmdline (installed-package-names.txt): systemd-networkd was added Changes to images/qemumips/glibc/core-image-sato (files-in-image.txt): /usr/lib/systemd/system-preset/98-systemd-networkd.preset was added /var/lib/opkg/info/systemd-networkd.conffiles was added /var/lib/opkg/info/systemd-networkd.control was added /var/lib/opkg/info/systemd-networkd.list was added /var/lib/opkg/info/systemd-networkd.postinst was added /var/lib/opkg/info/systemd-networkd.preinst was added /var/lib/opkg/info/systemd-networkd.prerm was added images/qemumips/glibc/core-image-sato: Changes to /etc/group: --- /etc/group +++ /etc/group @@ -41,9 +41,9 @@ wheel:x:80: users:x:100: pulse:x:991:pulse -systemd-timesync:x:992: -systemd-resolve:x:993: -systemd-network:x:994: +systemd-network:x:992: +systemd-timesync:x:993: +systemd-resolve:x:994: systemd-journal:x:995: avahi:x:996: render:x:997: -- images/qemumips/glibc/core-image-sato: Changes to /etc/passwd: --- /etc/passwd +++ /etc/passwd @@ -16,9 +16,9 @@ irc:x:39:39:ircd:/run/ircd:/usr/sbin/nologin _apt:x:42:65534::/nonexistent:/usr/sbin/nologin pulse:x:993:991::/var/run/pulse:/bin/false -systemd-timesync:x:994:992::/:/sbin/nologin -systemd-resolve:x:995:993::/:/sbin/nologin -systemd-network:x:996:994::/:/sbin/nologin +systemd-network:x:994:992::/:/sbin/nologin +systemd-timesync:x:995:993::/:/sbin/nologin +systemd-resolve:x:996:994::/:/sbin/nologin avahi:x:997:996::/run/avahi-daemon:/bin/false rpc:x:998:998::/:/bin/false messagebus:x:999:999::/var/lib/dbus:/bin/false -- Changes to images/qemumips/glibc/core-image-sato (installed-package-names.txt): systemd-networkd was added packages/mips32r2-poky-linux/systemd: PACKAGES: added "systemd-networkd" packages/mips32r2-poky-linux/systemd/systemd: FILELIST: removed "/usr/lib/systemd/network/80-vm-vt.network /usr/lib/systemd/system/systemd-networkd.service /usr/lib/systemd/network/80-namespace-ns.network /usr/lib/systemd/network/80-wifi-ap.network.example /usr/share/polkit-1/actions/org.freedesktop.network1.policy /usr/lib/systemd/network/80-wifi-station.network.example /usr/share/dbus-1/system-services/org.freedesktop.network1.service /usr/lib/systemd/network/80-6rd-tunnel.network /usr/lib/systemd/systemd-networkd /usr/lib/systemd/network/80-container-ve.network /usr/lib/systemd/network/80-wifi-adhoc.network /usr/lib/systemd/network/80-auto-link-local.network.example /usr/lib/systemd/network/80-container-host0-tun.network /usr/lib/systemd/network/80-container-vb.network /etc/systemd/networkd.conf /usr/bin/networkctl /usr/lib/systemd/system/systemd-networkd-persistent-storage.service /usr/lib/systemd/network/80-container-host0.network /usr/lib/systemd/system/systemd-networkd-wait-online@.service /usr/lib/systemd/systemd-networkd-wait-online /usr/lib/systemd/network/89-ethernet.network.example /usr/lib/tmpfiles.d/systemd-network.conf /usr/lib/systemd/system/systemd-networkd.socket /usr/lib/systemd/network/80-container-vz.network /usr/share/dbus-1/system.d/org.freedesktop.network1.conf /usr/lib/sysusers.d/systemd-network.conf /usr/lib/systemd/system/systemd-networkd-wait-online.service" packages/mips32r2-poky-linux/systemd/systemd: RRECOMMENDS: added "systemd-networkd" packages/mips32r2-poky-linux/systemd/systemd: PKGSIZE changed from 11479267 to 9601926 (-16%) packages/mips32r2-poky-linux/systemd/systemd: latest.pkg_preinst changed from "#!/bin/sh set -e bbnote () { echo "NOTE: $*" } bbwarn () { echo "WARNING: $*" } bbfatal () { echo "ERROR: $*" exit 1 } perform_groupadd () { local rootdir="$1" local opts="$2" bbnote "systemd: Performing groupadd with [$opts]" local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupadd \$opts\" || true group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then bbfatal "systemd: groupadd command did not succeed." fi else bbnote "systemd: group $groupname already exists, not re-creating it" fi } perform_useradd () { local rootdir="$1" local opts="$2" bbnote "systemd: Performing useradd with [$opts]" local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO useradd \$opts\" || true user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then bbfatal "systemd: useradd command did not succeed." fi else bbnote "systemd: user $username already exists, not re-creating it" fi } perform_groupmems () { local rootdir="$1" local opts="$2" bbnote "systemd: Performing groupmems with [$opts]" local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` bbnote "systemd: Running groupmems command with group $groupname and user $username" local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupmems \$opts\" || true mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then bbfatal "systemd: groupmems command did not succeed." fi else bbnote "systemd: group $groupname already contains $username, not re-adding it" fi } OPT="" SYSROOT="" if test "x$D" != "x"; then # Installing into a sysroot SYSROOT="$D" OPT="--root $D" # Make sure login.defs is there, this is to make debian package backend work # correctly while doing rootfs. # The problem here is that if /etc/login.defs is treated as a config file for # shadow package, then while performing preinsts for packages that depend on # shadow, there might only be /etc/login.def.dpkg-new there in root filesystem. if [ ! -e $D/etc/login.defs -a -e $D/etc/login.defs.dpkg-new ]; then cp $D/etc/login.defs.dpkg-new $D/etc/login.defs fi # user/group lookups should match useradd/groupadd --root export PSEUDO_PASSWD="$SYSROOT" fi # If we're not doing a special SSTATE/SYSROOT install # then set the values, otherwise use the environment if test "x$UA_SYSROOT" = "x"; then # Installing onto a target # Add groups and users defined only for this package GROUPADD_PARAM="-r systemd-journal; " USERADD_PARAM=" --system -d / -M --shell /sbin/nologin systemd-network; --system -d / -M --shell /sbin/nologin systemd-resolve; --system -d / -M --shell /sbin/nologin systemd-timesync; " GROUPMEMS_PARAM="" fi # Perform group additions first, since user additions may depend # on these groups existing if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupadd commands..." # Invoke multiple instances of groupadd for parameter lists # separated by ';' opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupadd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running useradd commands..." # Invoke multiple instances of useradd for parameter lists # separated by ';' opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_useradd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupmems commands..." # Invoke multiple instances of groupmems for parameter lists # separated by ';' opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupmems "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi " to "#!/bin/sh set -e bbnote () { echo "NOTE: $*" } bbwarn () { echo "WARNING: $*" } bbfatal () { echo "ERROR: $*" exit 1 } perform_groupadd () { local rootdir="$1" local opts="$2" bbnote "systemd: Performing groupadd with [$opts]" local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupadd \$opts\" || true group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then bbfatal "systemd: groupadd command did not succeed." fi else bbnote "systemd: group $groupname already exists, not re-creating it" fi } perform_useradd () { local rootdir="$1" local opts="$2" bbnote "systemd: Performing useradd with [$opts]" local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO useradd \$opts\" || true user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then bbfatal "systemd: useradd command did not succeed." fi else bbnote "systemd: user $username already exists, not re-creating it" fi } perform_groupmems () { local rootdir="$1" local opts="$2" bbnote "systemd: Performing groupmems with [$opts]" local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` bbnote "systemd: Running groupmems command with group $groupname and user $username" local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupmems \$opts\" || true mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then bbfatal "systemd: groupmems command did not succeed." fi else bbnote "systemd: group $groupname already contains $username, not re-adding it" fi } OPT="" SYSROOT="" if test "x$D" != "x"; then # Installing into a sysroot SYSROOT="$D" OPT="--root $D" # Make sure login.defs is there, this is to make debian package backend work # correctly while doing rootfs. # The problem here is that if /etc/login.defs is treated as a config file for # shadow package, then while performing preinsts for packages that depend on # shadow, there might only be /etc/login.def.dpkg-new there in root filesystem. if [ ! -e $D/etc/login.defs -a -e $D/etc/login.defs.dpkg-new ]; then cp $D/etc/login.defs.dpkg-new $D/etc/login.defs fi # user/group lookups should match useradd/groupadd --root export PSEUDO_PASSWD="$SYSROOT" fi # If we're not doing a special SSTATE/SYSROOT install # then set the values, otherwise use the environment if test "x$UA_SYSROOT" = "x"; then # Installing onto a target # Add groups and users defined only for this package GROUPADD_PARAM="-r systemd-journal; " USERADD_PARAM=" --system -d / -M --shell /sbin/nologin systemd-resolve; --system -d / -M --shell /sbin/nologin systemd-timesync; " GROUPMEMS_PARAM="" fi # Perform group additions first, since user additions may depend # on these groups existing if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupadd commands..." # Invoke multiple instances of groupadd for parameter lists # separated by ';' opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupadd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running useradd commands..." # Invoke multiple instances of useradd for parameter lists # separated by ';' opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_useradd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupmems commands..." # Invoke multiple instances of groupmems for parameter lists # separated by ';' opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupmems "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi "