diff --git a/autostart/systemd/fenrir.service b/autostart/systemd/fenrir.service deleted file mode 100644 index eeeebd07..00000000 --- a/autostart/systemd/fenrir.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Fenrir screenreader -Wants=systemd-udev-settle.service -After=systemd-udev-settle.service sound.target -[Service] -Type=forking -PIDFile=/var/run/fenrir.pid -ExecStart=/usr/bin/fenrir-daemon -ExecReload=/usr/bin/kill -HUP $MAINPID -Restart=always -#Group=fenrirscreenreader -#User=fenrirscreenreader - -[Install] -# start as early as possible in boot process -#WantedBy=sound.target -# start as soon the login prompt is available -WantedBy=getty.target diff --git a/install.sh b/install.sh index 2dd792ef..9a7a7931 100755 --- a/install.sh +++ b/install.sh @@ -5,7 +5,7 @@ read -p "This will install Fenrir. Press ctrl+C to cancel, or enter to continue. # Fenrir main application install -m755 -d /opt/fenrirscreenreader cp -af src/* /opt/fenrirscreenreader -install -m644 -D "autostart/systemd/fenrir.service" /etc/systemd/system/fenrir.service + ln -fs /opt/fenrirscreenreader/fenrir-daemon /usr/bin/fenrir-daemon ln -fs /opt/fenrirscreenreader/fenrir /usr/bin/fenrir # tools diff --git a/setup.py b/setup.py index 88c5f789..2643c2c9 100755 --- a/setup.py +++ b/setup.py @@ -44,7 +44,6 @@ destDir = '/usr/share/sounds/fenrirscreenreader/template' data_files.append((destDir, files)) files = glob.glob('tools/*') data_files.append(('/usr/share/fenrirscreenreader/tools', files)) -data_files.append(('/etc/systemd/system', ['autostart/systemd/fenrir.service'])) data_files.append(('/usr/share/man/man1', ['docu/fenrir.1'])) def read(fname):