From 3184c6f988e4bf2fe9e8dadf474fbc268c197118 Mon Sep 17 00:00:00 2001 From: arne_f Date: Tue, 4 Mar 2008 16:42:09 +0000 Subject: [PATCH] additional sane settings, backup of cfg, initscript git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1248 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/backup/includes/sane | 1 + config/rootfiles/packages/sane | 133 +++++++++++++++++---------------- lfs/sane | 9 ++- src/initscripts/init.d/sane | 12 +-- 4 files changed, 81 insertions(+), 74 deletions(-) create mode 100644 config/backup/includes/sane diff --git a/config/backup/includes/sane b/config/backup/includes/sane new file mode 100644 index 000000000..6b6beb942 --- /dev/null +++ b/config/backup/includes/sane @@ -0,0 +1 @@ +/etc/sane.d/ diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane index 75613aa15..96f6fa4f6 100644 --- a/config/rootfiles/packages/sane +++ b/config/rootfiles/packages/sane @@ -99,71 +99,71 @@ usr/doc/sane-1.0.19/umax/umax.BUGS usr/doc/sane-1.0.19/umax/umax.CHANGES usr/doc/sane-1.0.19/umax/umax.FAQ usr/doc/sane-1.0.19/umax/umax.TODO -#usr/etc/sane.d -usr/etc/sane.d/abaton.conf -usr/etc/sane.d/agfafocus.conf -usr/etc/sane.d/apple.conf -usr/etc/sane.d/artec.conf -usr/etc/sane.d/artec_eplus48u.conf -usr/etc/sane.d/avision.conf -usr/etc/sane.d/bh.conf -usr/etc/sane.d/canon.conf -usr/etc/sane.d/canon630u.conf -usr/etc/sane.d/cardscan.conf -usr/etc/sane.d/coolscan.conf -usr/etc/sane.d/coolscan2.conf -usr/etc/sane.d/dc210.conf -usr/etc/sane.d/dc240.conf -usr/etc/sane.d/dc25.conf -usr/etc/sane.d/dell1600n_net.conf -usr/etc/sane.d/dll.conf -usr/etc/sane.d/dmc.conf -usr/etc/sane.d/epjitsu.conf -usr/etc/sane.d/epson.conf -usr/etc/sane.d/epson2.conf -usr/etc/sane.d/fujitsu.conf -usr/etc/sane.d/genesys.conf -usr/etc/sane.d/gt68xx.conf -usr/etc/sane.d/hp.conf -usr/etc/sane.d/hp3900.conf -usr/etc/sane.d/hp4200.conf -usr/etc/sane.d/hp5400.conf -usr/etc/sane.d/hs2p.conf -usr/etc/sane.d/ibm.conf -usr/etc/sane.d/leo.conf -usr/etc/sane.d/lexmark.conf -usr/etc/sane.d/ma1509.conf -usr/etc/sane.d/matsushita.conf -usr/etc/sane.d/microtek.conf -usr/etc/sane.d/microtek2.conf -usr/etc/sane.d/mustek.conf -usr/etc/sane.d/mustek_usb.conf -usr/etc/sane.d/nec.conf -usr/etc/sane.d/net.conf -usr/etc/sane.d/pie.conf -usr/etc/sane.d/plustek.conf -usr/etc/sane.d/plustek_pp.conf -usr/etc/sane.d/qcam.conf -usr/etc/sane.d/ricoh.conf -usr/etc/sane.d/s9036.conf -usr/etc/sane.d/saned.conf -usr/etc/sane.d/sceptre.conf -usr/etc/sane.d/sharp.conf -usr/etc/sane.d/sm3840.conf -usr/etc/sane.d/snapscan.conf -usr/etc/sane.d/sp15c.conf -usr/etc/sane.d/st400.conf -usr/etc/sane.d/stv680.conf -usr/etc/sane.d/tamarack.conf -usr/etc/sane.d/teco1.conf -usr/etc/sane.d/teco2.conf -usr/etc/sane.d/teco3.conf -usr/etc/sane.d/test.conf -usr/etc/sane.d/u12.conf -usr/etc/sane.d/umax.conf -usr/etc/sane.d/umax1220u.conf -usr/etc/sane.d/umax_pp.conf -usr/etc/sane.d/v4l.conf +#etc/sane.d +etc/sane.d/abaton.conf +etc/sane.d/agfafocus.conf +etc/sane.d/apple.conf +etc/sane.d/artec.conf +etc/sane.d/artec_eplus48u.conf +etc/sane.d/avision.conf +etc/sane.d/bh.conf +etc/sane.d/canon.conf +etc/sane.d/canon630u.conf +etc/sane.d/cardscan.conf +etc/sane.d/coolscan.conf +etc/sane.d/coolscan2.conf +etc/sane.d/dc210.conf +etc/sane.d/dc240.conf +etc/sane.d/dc25.conf +etc/sane.d/dell1600n_net.conf +etc/sane.d/dll.conf +etc/sane.d/dmc.conf +etc/sane.d/epjitsu.conf +etc/sane.d/epson.conf +etc/sane.d/epson2.conf +etc/sane.d/fujitsu.conf +etc/sane.d/genesys.conf +etc/sane.d/gt68xx.conf +etc/sane.d/hp.conf +etc/sane.d/hp3900.conf +etc/sane.d/hp4200.conf +etc/sane.d/hp5400.conf +etc/sane.d/hs2p.conf +etc/sane.d/ibm.conf +etc/sane.d/leo.conf +etc/sane.d/lexmark.conf +etc/sane.d/ma1509.conf +etc/sane.d/matsushita.conf +etc/sane.d/microtek.conf +etc/sane.d/microtek2.conf +etc/sane.d/mustek.conf +etc/sane.d/mustek_usb.conf +etc/sane.d/nec.conf +etc/sane.d/net.conf +etc/sane.d/pie.conf +etc/sane.d/plustek.conf +etc/sane.d/plustek_pp.conf +etc/sane.d/qcam.conf +etc/sane.d/ricoh.conf +etc/sane.d/s9036.conf +etc/sane.d/saned.conf +etc/sane.d/sceptre.conf +etc/sane.d/sharp.conf +etc/sane.d/sm3840.conf +etc/sane.d/snapscan.conf +etc/sane.d/sp15c.conf +etc/sane.d/st400.conf +etc/sane.d/stv680.conf +etc/sane.d/tamarack.conf +etc/sane.d/teco1.conf +etc/sane.d/teco2.conf +etc/sane.d/teco3.conf +etc/sane.d/test.conf +etc/sane.d/u12.conf +etc/sane.d/umax.conf +etc/sane.d/umax1220u.conf +etc/sane.d/umax_pp.conf +etc/sane.d/v4l.conf #usr/include/sane usr/include/sane/sane.h usr/include/sane/saneopts.h @@ -561,7 +561,7 @@ usr/share/sane/epjitsu usr/share/sane/gt68xx usr/share/sane/snapscan usr/var/lock/sane -usr/etc/sane.d/mustek_pp.conf +etc/sane.d/mustek_pp.conf #usr/lib/sane/libsane-mustek_pp.la usr/lib/sane/libsane-mustek_pp.so usr/lib/sane/libsane-mustek_pp.so.1 @@ -571,3 +571,4 @@ etc/rc.d/rc3.d/S95sane etc/rc.d/rc0.d/K10sane etc/rc.d/rc6.d/K10sane usr/local/bin/sanedloop +var/ipfire/backup/addons/includes/sane diff --git a/lfs/sane b/lfs/sane index da35cfab9..02e111834 100644 --- a/lfs/sane +++ b/lfs/sane @@ -77,13 +77,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6 \ + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-ipv6 \ --enable-parport-directio cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cp -vf $(DIR_SRC)/config/sane/saned.conf /usr/etc/sane.d/ + chmod 4755 /usr/bin/scanimage + cp -vf $(DIR_SRC)/config/sane/saned.conf /etc/sane.d/ ln -sf ../init.d/sane /etc/rc.d/rc3.d/S95sane ln -sf ../init.d/sane /etc/rc.d/rc0.d/K10sane ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane + install -v -m 644 $(DIR_SRC)/config/backup/includes/sane \ + /var/ipfire/backup/addons/includes/sane @rm -rf $(DIR_APP) @$(POSTBUILD) + \ No newline at end of file diff --git a/src/initscripts/init.d/sane b/src/initscripts/init.d/sane index 3ada55761..ded0c0dac 100644 --- a/src/initscripts/init.d/sane +++ b/src/initscripts/init.d/sane @@ -18,17 +18,17 @@ case "${1}" in start) - boot_mesg "Starting sane - network scanner deamon..." - killall sanedloop > /dev/nul 2&>1 - killall saned > /dev/nul 2&>1 + boot_mesg "Starting saned - network scanner deamon..." + killall -s KILL -w sanedloop > /dev/nul 2>&1 + killall -s KILL -w saned > /dev/nul 2>&1 /usr/local/bin/sanedloop & evaluate_retval ;; stop) - boot_mesg "Stopping sane - network scanner deamon..." - killall sanedloop > /dev/nul 2&>1 - killall saned > /dev/nul 2&>1 + boot_mesg "Stopping saned - network scanner deamon..." + killall -s KILL -w sanedloop > /dev/nul 2>&1 + killall -s KILL -w saned > /dev/nul 2>&1 echo_ok ;; -- 2.39.2