diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-09-15 13:29:01 +0100 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-09-15 13:29:01 +0100 |
commit | a6c0b23905965b787b46a4cf13b42b600d5b67e7 (patch) | |
tree | c613e1bf351ebe0190fe51cb849b33bcffa083ca /perl-install/scanner.pm | |
parent | 7c3631482286d17a2983a47295ce9b0872780a8d (diff) | |
download | drakx-a6c0b23905965b787b46a4cf13b42b600d5b67e7.tar drakx-a6c0b23905965b787b46a4cf13b42b600d5b67e7.tar.gz drakx-a6c0b23905965b787b46a4cf13b42b600d5b67e7.tar.bz2 drakx-a6c0b23905965b787b46a4cf13b42b600d5b67e7.tar.xz drakx-a6c0b23905965b787b46a4cf13b42b600d5b67e7.zip |
Fix saned activation/deactivation in scanner functions.
Our saned package switched from xinetd to systemd socket activation
back in 2019.
Diffstat (limited to 'perl-install/scanner.pm')
-rw-r--r-- | perl-install/scanner.pm | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm index 8967dd7d0..777f7192f 100644 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -177,7 +177,7 @@ sub nonroot_access_for_parport { # Desired state of this facility: 1: Enable, 0: Disable my ($enable, $in) = @_; # Is saned running? - my $sanedrunning = services::starts_on_boot("saned"); + my $sanedrunning = services::starts_on_boot("saned.socket"); # Is the "net" SANE backend active my $netbackendactive = find { /^\s*net\s*$/ } cat_("/etc/sane.d/dll.conf"); @@ -191,11 +191,9 @@ sub nonroot_access_for_parport { # Install/start saned if (!$sanedrunning) { - # Make sure saned and xinetd is installed and - # running - if (!files_exist('/usr/sbin/xinetd', - '/usr/sbin/saned')) { - if (!$in->do_pkgs->install('xinetd', 'saned')) { + # Make sure saned is installed and running + if (!files_exist('/usr/sbin/saned')) { + if (!$in->do_pkgs->install('saned')) { $in->ask_warn(N("Scannerdrake"), N("Could not install the packages needed to share your scanner(s).") . " " . N("Your scanner(s) will not be available for non-root users.")); @@ -204,12 +202,6 @@ sub nonroot_access_for_parport { } } - # Modify /etc/xinetd.d/saned to let saned run as root - my @sanedxinetdconf = cat_("/etc/xinetd.d/saned"); - s/(user\s*=\s*).*$/$1root/ foreach @sanedxinetdconf; - s/(group\s*=\s*).*$/$1root/ foreach @sanedxinetdconf; - output("/etc/xinetd.d/saned", @sanedxinetdconf); - # Read list of hosts to where to export the local scanners my @exports = cat_("/etc/sane.d/saned.conf"); # Read list of hosts from where to import scanners @@ -230,22 +222,7 @@ sub nonroot_access_for_parport { # (Re)start saned and make sure that it gets started on # every boot - services::start_service_on_boot("saned"); - services::start_service_on_boot("xinetd"); - services::restart("xinetd"); - - } else { - # Disable non-root access - - if (-r "/etc/xinetd.d/saned") { - # Modify /etc/xinetd.d/saned to let saned run as saned - my @sanedxinetdconf = cat_("/etc/xinetd.d/saned"); - s/(user\s*=\s*).*$/$1saned/ foreach @sanedxinetdconf; - s/(group\s*=\s*).*$/$1saned/ foreach @sanedxinetdconf; - output("/etc/xinetd.d/saned", @sanedxinetdconf); - # Restart xinetd - services::restart("xinetd") if $sanedrunning; - } + services::enable("saned.socket"); } return 1; |