diff --git a/.gitignore b/.gitignore index d2b0e46b6..574760c06 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .vscode/settings.json arm.conf.yaml logs/* +*.log test.sh archive/ config diff --git a/README.md b/README.md index 435499b29..b68a59032 100755 --- a/README.md +++ b/README.md @@ -89,7 +89,6 @@ cd arm git checkout v2_master sudo pip3 install -r requirements.txt sudo ln -s /opt/arm/setup/51-automedia.rules /lib/udev/rules.d/ -sudo cp /opt/arm/setup/arm@.service /etc/systemd/system/ sudo ln -s /opt/arm/setup/.abcde.conf /home/arm/ cp docs/arm.yaml.sample arm.yaml sudo mkdir /etc/arm/ diff --git a/scripts/arm_wrapper.sh b/scripts/arm_wrapper.sh new file mode 100644 index 000000000..bec59db1b --- /dev/null +++ b/scripts/arm_wrapper.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +DEVNAME=$1 + +echo "Starting ARM on ${DEVNAME}" | logger -t ARM +/bin/su -c "echo /usr/bin/python3 /opt/arm/arm/main.py -d ${DEVNAME} | at now" -s /bin/bash arm diff --git a/setup/51-automedia.rules b/setup/51-automedia.rules index 8da5bdb90..93cda6f72 100755 --- a/setup/51-automedia.rules +++ b/setup/51-automedia.rules @@ -3,5 +3,7 @@ # ID_CDROM_MEDIA_CD = CD # ACTION=="change", SUBSYSTEM=="block", RUN+="/opt/arm/arm_wrapper.sh" # ACTION=="change", SUBSYSTEM=="block", RUN+="/opt/arm/arm/main.py -l '%E{ID_FS_LABEL}' -d '%E{DEVNAME}'" -ACTION=="change", SUBSYSTEM=="block", TAG+="systemd", KERNEL=="sr[0-9]*|vdisk*|xvd*", ENV{DEVTYPE}=="disk", RUN+="/bin/systemctl start arm@%k.service" +# ACTION=="change", SUBSYSTEM=="block", TAG+="systemd", KERNEL=="sr[0-9]*|vdisk*|xvd*", ENV{DEVTYPE}=="disk", RUN+="/bin/systemctl start arm@%k.service" +ACTION=="change", SUBSYSTEM=="block", RUN+="/opt/arm/scripts/arm_wrapper.sh %k" + diff --git a/setup/arm@.service b/setup/arm@.service deleted file mode 100755 index bdb943bb1..000000000 --- a/setup/arm@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Automatic Ripping Machine - -[Service] -Type=oneshot -User=arm -Group=arm -WorkingDirectory=/home/arm -ExecStart=/opt/arm/arm/main.py -d %i -SyslogIdentifier=arm - -[Install] -WantedBy=multi-user.target