diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-02 16:33:05 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-02 16:33:05 +0200 |
| commit | 1ba51d2fbddd5650f8caea0a327b9031238ad843 (patch) | |
| tree | 05d5df7b487e76597b34cb0b1fc9543525169a62 /system | |
| parent | 0c94aa549cc8cf483bc8c3443a2b1f772d5d180b (diff) | |
| parent | fb2f3d58bde6aaac12b62eeb16492c93329b8713 (diff) | |
| download | buildroot-novena-1ba51d2fbddd5650f8caea0a327b9031238ad843.tar.gz buildroot-novena-1ba51d2fbddd5650f8caea0a327b9031238ad843.zip | |
Merge branch 'next'
Diffstat (limited to 'system')
| -rw-r--r-- | system/device_table.txt | 2 | ||||
| -rw-r--r-- | system/system.mk | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/system/device_table.txt b/system/device_table.txt index 421728b08..43c0cfa0b 100644 --- a/system/device_table.txt +++ b/system/device_table.txt @@ -9,7 +9,7 @@ /dev d 755 0 0 - - - - - /tmp d 1777 0 0 - - - - - /etc d 755 0 0 - - - - - -/home/default d 2755 1000 1000 - - - - - +/home/default d 755 1000 1000 - - - - - /var/www d 755 33 33 - - - - - /etc/shadow f 600 0 0 - - - - - /etc/passwd f 644 0 0 - - - - - diff --git a/system/system.mk b/system/system.mk index 44a33ae61..50c86ad60 100644 --- a/system/system.mk +++ b/system/system.mk @@ -9,6 +9,10 @@ TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) TARGET_GENERIC_GETTY_TERM:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM)) +target-generic-securetty: + grep -q '^$(TARGET_GENERIC_GETTY)$$' $(TARGET_DIR)/etc/securetty || \ + echo '$(TARGET_GENERIC_GETTY)' >> $(TARGET_DIR)/etc/securetty + target-generic-hostname: mkdir -p $(TARGET_DIR)/etc echo "$(TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname @@ -40,6 +44,10 @@ target-generic-do-remount-rw: target-generic-dont-remount-rw: $(SED) '/^[^#].*# REMOUNT_ROOTFS_RW$$/s~^~#~' $(TARGET_DIR)/etc/inittab +ifneq ($(TARGET_GENERIC_GETTY),) +TARGETS += target-generic-securetty +endif + ifneq ($(TARGET_GENERIC_HOSTNAME),) TARGETS += target-generic-hostname endif |