diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2013-11-12 14:07:36 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2013-11-12 14:07:36 -0600 |
| commit | 47a2e372d57540f4afc074ee767b3f655e4bfd52 (patch) | |
| tree | 876827e8c017aa45e3164484adc3ccb6054060ae | |
| parent | 3db5bd6de9480677a97a3c31b85270a800cf24df (diff) | |
config: mount /var/oem only if present in /etc/fstab
| -rw-r--r-- | multitech/recipes/multitech/config/config.init | 20 | ||||
| -rw-r--r-- | multitech/recipes/multitech/config_1.0.bb | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/multitech/recipes/multitech/config/config.init b/multitech/recipes/multitech/config/config.init index 98bbf35..99ef802 100644 --- a/multitech/recipes/multitech/config/config.init +++ b/multitech/recipes/multitech/config/config.init @@ -2,7 +2,9 @@ CONFIG_MTDC=/dev/mtd6 CONFIG_DIR=/var/config + OEM_MTDC=/dev/mtd7 +OEM_MTDB=/dev/mtdblock7 OEM_DIR=/var/oem FILES="network/interfaces \ @@ -26,15 +28,17 @@ case $1 in mount ${CONFIG_DIR} fi - echo "Mounting ${OEM_DIR}" - mkdir -p ${OEM_DIR} - mount ${OEM_DIR} - - # Prepare flash for JFFS2 if mount fails - if [ $? -ne 0 ]; then - echo "Creating ${OEM_DIR}" - flash_eraseall -j ${OEM_MTDC} + if grep -qE "^${OEM_MTDB}\s+${OEM_DIR}\s+" /etc/fstab; then + echo "Mounting ${OEM_DIR}" + mkdir -p ${OEM_DIR} mount ${OEM_DIR} + + # Prepare flash for JFFS2 if mount fails + if [ $? -ne 0 ]; then + echo "Creating ${OEM_DIR}" + flash_eraseall -j ${OEM_MTDC} + mount ${OEM_DIR} + fi fi # Default all config files if requested diff --git a/multitech/recipes/multitech/config_1.0.bb b/multitech/recipes/multitech/config_1.0.bb index 7d488d2..5ec078c 100644 --- a/multitech/recipes/multitech/config_1.0.bb +++ b/multitech/recipes/multitech/config_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Provides default system config files and /var/config fs" SECTION = "base" LICENSE = "GPL" -PR = "r19" +PR = "r20" inherit update-rc.d |