KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: add permission exceptions, do not clobber shadow permissions - based on patch by Mark Mentovai <mark@moxienet.com>

Browse source 
SVN-Revision: 32073
This commit is contained in:
Jo-Philipp Wich 2012-06-05 18:02:00 +00:00
parent f8655c0177
commit 6cdf25289c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/image.mk
View file

@ -142,7 +142,7 @@ endif
define Image/mkfs/prepare/default define Image/mkfs/prepare/default
# Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits # Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits
- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r - $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -not -name 'shadow' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
- $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx - $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx - $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
$(INSTALL_DIR) $(TARGET_DIR)/tmp $(INSTALL_DIR) $(TARGET_DIR)/tmp

4
package/base-files/Makefile
View file

@ -470,6 +470,10 @@ define Package/base-files/install
ln -sf /tmp $(1)/var ln -sf /tmp $(1)/var
mkdir -p $(1)/etc mkdir -p $(1)/etc
ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
chmod 0600 $(1)/etc/shadow
chmod 1777 $(1)/tmp
$(call ImageConfigOptions,$(1)) $(call ImageConfigOptions,$(1))
$(call Package/base-files/install-target,$(1)) $(call Package/base-files/install-target,$(1))
for conffile in $(1)/etc/config/*; do \ for conffile in $(1)/etc/config/*; do \