diff options
| -rw-r--r-- | mount-data/Makefile | 4 | ||||
| -rwxr-xr-x | mount-data/files/init | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/mount-data/Makefile b/mount-data/Makefile index 3af25b5..69f082b 100644 --- a/mount-data/Makefile +++ b/mount-data/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mount-data -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.0.1 PKG_MAINTAINER:=Karel Kočí <cynerd@email.cz> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -20,7 +20,7 @@ endef define Package/mount-data/install $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DATA) ./files/init $(1)/etc/init.d/data + $(INSTALL_BIN) ./files/init $(1)/etc/init.d/data endef Build/Compile:=: diff --git a/mount-data/files/init b/mount-data/files/init index 035f82f..c9706f5 100755 --- a/mount-data/files/init +++ b/mount-data/files/init @@ -3,8 +3,6 @@ START=36 STOP=90 -UUID_A="3472bef9-cbae-48bd-873e-fd4858a0b72f" -UUID_B="ad73f0bf-3cc5-4aee-842f-992db6a642e3" UUID="f71f2b6c-fc49-4a9b-91b3-7eaab853a02d" is_open() { @@ -12,7 +10,7 @@ is_open() { } open() { - cryptsetup open --key-file /etc/keys/sd "UUID=$2" "data_$1" + cryptsetup open --key-file /etc/keys/sd "$2" "data_$1" } close() { @@ -37,10 +35,10 @@ status() { } start() { - is_open a || open a "$UUID_A" - is_open b || open b "$UUID_B" - is_mounted "/data" || mount @data /data - is_mounted "/srv" || mount @srv /srv + is_open a || open a /dev/sda + is_open b || open b /dev/sdb + is_mounted "/data" || mount_btrfs @data /data + is_mounted "/srv" || mount_btrfs @srv /srv } stop() { |