diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 6abab60d7f..f03ef969ad 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
@@ -79,7 +79,7 @@ fakeroot do_populate_poky_src () { | |||
79 | echo "# export ALL_PROXY=https://proxy.example.com:8080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc | 79 | echo "# export ALL_PROXY=https://proxy.example.com:8080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc |
80 | echo "# export ALL_PROXY=socks://socks.example.com:1080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc | 80 | echo "# export ALL_PROXY=socks://socks.example.com:1080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc |
81 | 81 | ||
82 | chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/poky | 82 | chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/poky |
83 | chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/poky | 83 | chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/poky |
84 | 84 | ||
85 | # Assume we will need CDROM to install guest additions | 85 | # Assume we will need CDROM to install guest additions |
@@ -107,8 +107,8 @@ fakeroot do_populate_poky_src () { | |||
107 | pip3_install_params="${pip3_install_params} --proxy ${http_proxy}" | 107 | pip3_install_params="${pip3_install_params} --proxy ${http_proxy}" |
108 | fi | 108 | fi |
109 | pip3 install ${pip3_install_params} | 109 | pip3 install ${pip3_install_params} |
110 | chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/.local | 110 | chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/.local |
111 | chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/.cache | 111 | chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/.cache |
112 | } | 112 | } |
113 | 113 | ||
114 | IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " | 114 | IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " |
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh index 824f8f3a6b..6f965a6870 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | |||
@@ -37,7 +37,7 @@ create_file() { | |||
37 | } | 37 | } |
38 | EXEC=" | 38 | EXEC=" |
39 | ${EXEC} | 39 | ${EXEC} |
40 | chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; | 40 | chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; |
41 | chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " | 41 | chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " |
42 | 42 | ||
43 | test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build | 43 | test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build |
@@ -60,7 +60,7 @@ create_file() { | |||
60 | mk_dir() { | 60 | mk_dir() { |
61 | EXEC=" | 61 | EXEC=" |
62 | mkdir -p \"$1\"; | 62 | mkdir -p \"$1\"; |
63 | chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; | 63 | chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; |
64 | chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " | 64 | chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " |
65 | 65 | ||
66 | test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build | 66 | test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build |
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index a21e7e46f7..bfc1283f73 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | |||
@@ -105,6 +105,6 @@ do_install () { | |||
105 | install -d ${D}${sysconfdir}/default/volatiles | 105 | install -d ${D}${sysconfdir}/default/volatiles |
106 | install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles | 106 | install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles |
107 | 107 | ||
108 | chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 108 | chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
109 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 109 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
110 | } | 110 | } |