NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sudo: fix rmdir

Browse Source 
When a previous package (e.g. a custom skeleton) or on a rebuild, the
sudoers.d directory may be non-empty, if the user has installed a custom
config file there, so we do not want to remove the directory if it is
not empty; we just want to remove it if it is empty.

Pass --ignore-fail-on-non-empty to rmdir to fix the following error:

rmdir /usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/target/etc/sudoers.d
rmdir: failed to remove '/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-2/output/target/etc/sudoers.d': Directory not empty

Fixes:
 - http://autobuild.buildroot.org/results/0cfc61a98760c1d3a98aa0f1e126767881c49abd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr:
  - expand commit log to explain why we don't do rm -rf
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2019-11-08 18:37:19 +01:00 committed by Yann E. MORIN
parent 26f42106e8
commit d7131269b8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/sudo/sudo.mk
View File

@ -66,7 +66,7 @@ endef
define SUDO_REMOVE_DIST_EXAMPLES
$(RM) $(TARGET_DIR)/etc/sudoers.dist
rmdir $(TARGET_DIR)/etc/sudoers.d
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/sudoers.d
endef
SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_REMOVE_DIST_EXAMPLES