Attachment #9789 for bug #31074

View | Details | Raw Unified | Return to bug 31074
Collapse All | Expand All




PATH=/usr/sbin:/usr/bin:/sbin:/bin

@!@
disabled = '' if configRegistry.is_true('update/check/cron/enabled') else '#'
debug = '' if configRegistry.is_true('update/check/cron/debug') else '2>/dev/null'
if not configRegistry.is_true('update/check/cron/enabled', False):
        disabled = '# '
if not configRegistry.get('update/check/cron/debug','no').lower() in ('yes','true','enabled','1','2','3','4'):
        debug = '2> /dev/null > /dev/null'
print '%s%s   root   [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 600 /usr/share/univention-updater/univention-updater-check %s' % (disabled, configRegistry.get('update/check/cron/entry', '5 * * * *'), debug)

disabled = '' if configRegistry.is_true('update/check/boot/enabled') else '#'
debug = '' if configRegistry.is_true('update/check/boot/debug') else '2>/dev/null'
if not configRegistry.is_true('update/check/boot/enabled', False):
        disabled = '# '
if not configRegistry.get('update/check/boot/debug','no').lower() in ('yes','true','enabled','1','2','3','4'):
        debug = '2> /dev/null > /dev/null'
print '%s@reboot   root   [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 30 /usr/share/univention-updater/univention-updater-check %s' % (disabled, debug)
@!@




		update/warning/coloured?"no" \
		update/warning/lang?"default" \
		update/warning/tty?"/dev/tty1 /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6 /dev/tty7" \
		update/umc/nextversion?true \
		repository/online?no \
		repository/online/server?"${REPOSITORY}" \
		repository/online/unmaintained?no \

		repository/mirror/recreate_packages?no \
		repository/mirror/basepath?/var/lib/univention-repository \
		repository/credentials/'Univention Software Repository'/uris?'updates.software-univention.de updates-test.software-univention.de appcenter.software-univention.de appcenter-test.software-univention.de' \
		update/custom/preup?/var/lib/local-preup.sh \
		update/custom/postup?/var/lib/local-postup.sh \
		update/commands/update?"apt-get update" \
		update/commands/show?"apt-cache show" \
		update/commands/install?"apt-get -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-overwrite -o DPkg::Options::=--force-overwrite-dir --trivial-only=no --assume-yes --quiet=1 install" \
- 

Return to bug 31074

Lines 3-21 Link Here

(-)a/base/univention-updater/conffiles/etc/cron.d/univention-updater-check (-12 / +4 lines)
3	PATH=/usr/sbin:/usr/bin:/sbin:/bin	3	PATH=/usr/sbin:/usr/bin:/sbin:/bin
4		4
5	@!@	5	@!@
6	disabled = ''	6	disabled = '' if configRegistry.is_true('update/check/cron/enabled') else '#'
7	debug = ''	7	debug = '' if configRegistry.is_true('update/check/cron/debug') else '2>/dev/null'
8	if not configRegistry.is_true('update/check/cron/enabled', False):
9	disabled = '# '
10	if not configRegistry.get('update/check/cron/debug','no').lower() in ('yes','true','enabled','1','2','3','4'):
11	debug = '2> /dev/null > /dev/null'
12	print '%s%s root [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 600 /usr/share/univention-updater/univention-updater-check %s' % (disabled, configRegistry.get('update/check/cron/entry', '5 * * * *'), debug)	8	print '%s%s root [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 600 /usr/share/univention-updater/univention-updater-check %s' % (disabled, configRegistry.get('update/check/cron/entry', '5 * * * *'), debug)
13		9
14	disabled = ''	10	disabled = '' if configRegistry.is_true('update/check/boot/enabled') else '#'
15	debug = ''	11	debug = '' if configRegistry.is_true('update/check/boot/debug') else '2>/dev/null'
16	if not configRegistry.is_true('update/check/boot/enabled', False):
17	disabled = '# '
18	if not configRegistry.get('update/check/boot/debug','no').lower() in ('yes','true','enabled','1','2','3','4'):
19	debug = '2> /dev/null > /dev/null'
20	print '%s@reboot root [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 30 /usr/share/univention-updater/univention-updater-check %s' % (disabled, debug)	12	print '%s@reboot root [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 30 /usr/share/univention-updater/univention-updater-check %s' % (disabled, debug)
21	@!@	13	@!@

Lines 73-79 if [ "$1" = "configure" ]; then Link Here

(-)a/base/univention-updater/debian/univention-updater.postinst (-4 lines)
73	update/warning/coloured?"no" \	73	update/warning/coloured?"no" \
74	update/warning/lang?"default" \	74	update/warning/lang?"default" \
75	update/warning/tty?"/dev/tty1 /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6 /dev/tty7" \	75	update/warning/tty?"/dev/tty1 /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6 /dev/tty7" \
76	update/umc/nextversion?true \
77	repository/online?no \	76	repository/online?no \
78	repository/online/server?"${REPOSITORY}" \	77	repository/online/server?"${REPOSITORY}" \
79	repository/online/unmaintained?no \	78	repository/online/unmaintained?no \
Lines 82-89 if [ "$1" = "configure" ]; then Link Here
82	repository/mirror/recreate_packages?no \	81	repository/mirror/recreate_packages?no \
83	repository/mirror/basepath?/var/lib/univention-repository \	82	repository/mirror/basepath?/var/lib/univention-repository \
84	repository/credentials/'Univention Software Repository'/uris?'updates.software-univention.de updates-test.software-univention.de appcenter.software-univention.de appcenter-test.software-univention.de' \	83	repository/credentials/'Univention Software Repository'/uris?'updates.software-univention.de updates-test.software-univention.de appcenter.software-univention.de appcenter-test.software-univention.de' \
85	update/custom/preup?/var/lib/local-preup.sh \
86	update/custom/postup?/var/lib/local-postup.sh \
87	update/commands/update?"apt-get update" \	84	update/commands/update?"apt-get update" \
88	update/commands/show?"apt-cache show" \	85	update/commands/show?"apt-cache show" \
89	update/commands/install?"apt-get -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-overwrite -o DPkg::Options::=--force-overwrite-dir --trivial-only=no --assume-yes --quiet=1 install" \	86	update/commands/install?"apt-get -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-overwrite -o DPkg::Options::=--force-overwrite-dir --trivial-only=no --assume-yes --quiet=1 install" \
90	-