Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cscreen for openSUSE:Factory checked in at 2021-04-29 01:38:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cscreen (Old) and /work/SRC/openSUSE:Factory/.cscreen.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cscreen" Thu Apr 29 01:38:30 2021 rev:5 rq:889025 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cscreen/cscreen.changes 2020-09-25 16:37:31.552209434 +0200 +++ /work/SRC/openSUSE:Factory/.cscreen.new.12324/cscreen.changes 2021-04-29 01:39:36.418681011 +0200 @@ -1,0 +2,34 @@ +Wed Apr 21 12:13:14 UTC 2021 - o...@aepfle.de + +- version 1.1 +- set hard status in cscreenrc example +- use wrapper script for shell/SHELL +- fix screen execution + +------------------------------------------------------------------- +Tue Apr 20 10:20:30 UTC 2021 - o...@aepfle.de + +- version 1.0 +- start cscreen earlier by ordering it right after local-fs.target +- add zombie_timeout to default cscreenrc +- adjust Requires for scriptlets +- package cscreen-rpmlintrc +- Set LimitNOFILE= to compensate for lack of SCREEN_FILE_LIMIT +- use fillup and sysconfig only with sysv +- fillup file should be owned by root +- use DISABLE_RESTART_ON_UPDATE also with sysv +- %license macro does not work reliably in 13.2 +- check if rpm macro has_systemd exists +- own suders.d if needed +- use name macro consistently +- remove Requires for apparently unused mailx +- use screen variable in cscreen script +- use SCREEN_OWNER in cscreen script +- use SCREENRC variable consistently +- use SCREEN_NAME variable consistently +- remove leading slash from sysv SCREEN_NAME +- move defscrollback to SCREEN_HISTORY +- Pass more characters to the remote system (bsc#1162835). +- Get rid of /etc/sudoers.d directory to avoid file conflicts at install time + +------------------------------------------------------------------- Old: ---- cscreen-0.8.tar.xz New: ---- cscreen-1.1.tar.xz cscreen-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cscreen.spec ++++++ --- /var/tmp/diff_new_pack.BG8EeY/_old 2021-04-29 01:39:36.778681521 +0200 +++ /var/tmp/diff_new_pack.BG8EeY/_new 2021-04-29 01:39:36.782681526 +0200 @@ -31,21 +31,24 @@ Requires(pre): %insserv_prereq %endif Name: cscreen -Version: 0.8 +Version: 1.1 Release: 0 Summary: Console screen License: BSD-4-Clause Group: System/Management URL: https://github.com/openSUSE/cscreen Source: %{name}-%{version}.tar.xz +Source1: %{name}-rpmlintrc +BuildRequires: sudo Recommends: logrotate -Requires: mailx Requires: screen Requires: sudo -Requires(postun): /usr/bin/rm -# FIXME: use proper Requires(pre/post/preun/...) +Requires(pre): shadow +Requires(postun): coreutils +%if 0%{?has_systemd} +%else PreReq: %fillup_prereq -PreReq: shadow +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,15 +62,21 @@ %build # %install +> %{name}.files +if ! test -d %{_sysconfdir}/sudoers.d +then + echo '%%dir %{_sysconfdir}/sudoers.d' >> %{name}.files +fi mkdir -p %{buildroot}/%{_sbindir} -%if %{?has_systemd} +%if 0%{?has_systemd} install -Dm644 systemd/cscreen.service %{buildroot}/%{_unitdir}/%{name}d.service pushd %{buildroot}/%{_sbindir} ln -sf service %{buildroot}%{_sbindir}/rc%{name}d popd %else -install -Dm755 systemd/cscreen.init %{buildroot}/%{_sysconfdir}/init.d/cscreend +install -Dm644 configs/%{name}.sysconfig %{buildroot}/%{_fillupdir}/sysconfig.%{name} +install -Dm755 systemd/cscreen.init %{buildroot}/%{_sysconfdir}/init.d/%{name}d pushd %{buildroot}/%{_sbindir} ln -s %{_sysconfdir}/init.d/%{name}d rc%{name}d popd @@ -75,8 +84,8 @@ install -Dm640 configs/%{name}.config %{buildroot}/%{_sysconfdir}/%{name}rc install -Dm644 configs/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} -install -Dm644 configs/%{name}.sudoers %{buildroot}%{_sysconfdir}/sudoers.d/cscreen -install -Dm644 configs/%{name}.sysconfig %{buildroot}/%{_fillupdir}/sysconfig.%{name} +install -Dm644 configs/%{name}.sudoers %{buildroot}%{_sysconfdir}/sudoers.d/%{name} +install -Dm755 src/%{name}-shell %{buildroot}/%{_datadir}/%{name}/%{name}-shell install -Dm755 src/%{name} %{buildroot}/%{_bindir}/%{name} install -Dm755 src/%{name}_update_config.sh %{buildroot}/%{_bindir}/cscreen_update_config.sh @@ -85,7 +94,7 @@ mkdir -pm700 %{buildroot}/%{HOMEDIR}/.ssh %pre -%if %{?has_systemd} +%if 0%{?has_systemd} %service_add_pre %{name}d.service %endif getent group %{GROUPNAME} >/dev/null || groupadd -r %{GROUPNAME} @@ -103,22 +112,22 @@ -c "cscreen daemon user" %{USERNAME} $TTY_GROUP %post -%if %{?has_systemd} +%if 0%{?has_systemd} %service_add_post %{name}d.service %else %{fillup_and_insserv %{name}d } -%endif %fillup_only %{name} +%endif %preun -%if %{?has_systemd} +%if 0%{?has_systemd} %service_del_preun %{name}d.service %else %stop_on_removal %{name}d %endif %postun -%if %{?has_systemd} +%if 0%{?has_systemd} %if %{defined service_del_postun_without_restart} %service_del_postun_without_restart %{name}d.service %else @@ -126,6 +135,7 @@ %service_del_postun %{name}d.service %endif %else +DISABLE_RESTART_ON_UPDATE=yes %restart_on_update %{name}d %insserv_cleanup %endif @@ -136,26 +146,26 @@ fi fi -%files +%files -f %{name}.files %defattr(-,root,root) %doc docs/motd_example -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} > 1320 %license License %endif %{_bindir}/%{name} %{_bindir}/cscreen_update_config.sh -%if %{?has_systemd} -%{_unitdir}/cscreend.service +%{_datadir}/%{name} +%if 0%{?has_systemd} +%{_unitdir}/%{name}d.service %else -%{_sysconfdir}/init.d/cscreend +%attr(0644,root,root) %{_fillupdir}/sysconfig.%{name} +%{_sysconfdir}/init.d/%{name}d %endif %{_sbindir}/rc%{name}d -%attr(0750,root,root) %dir %{_sysconfdir}/sudoers.d -%attr(0640,root,root) %config %{_sysconfdir}/sudoers.d/cscreen +%attr(0640,root,root) %config %{_sysconfdir}/sudoers.d/%{name} %attr(755,%{USERNAME}, %{GROUPNAME}) %dir %{_localstatedir}/log/screen %attr(755,%{USERNAME}, %{GROUPNAME}) %dir %{_localstatedir}/log/screen/old -%attr(644,%{USERNAME}, %{GROUPNAME}) %{_fillupdir}/sysconfig.%{name} %attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR} %attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR}/.ssh %attr(644,%{USERNAME}, %{GROUPNAME}) %config(noreplace) %{_sysconfdir}/%{name}rc ++++++ _service ++++++ --- /var/tmp/diff_new_pack.BG8EeY/_old 2021-04-29 01:39:36.806681560 +0200 +++ /var/tmp/diff_new_pack.BG8EeY/_new 2021-04-29 01:39:36.806681560 +0200 @@ -2,7 +2,7 @@ <service mode="disabled" name="obs_scm"> <param name="url">git://github.com/openSUSE/cscreen.git</param> <param name="scm">git</param> - <param name="revision">master</param> + <param name="revision">2a780bffa05d25698f96fd276718eb285cdb67ef</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param> <param name="versionrewrite-replacement">\1</param> ++++++ cscreen-0.8.tar.xz -> cscreen-1.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/configs/cscreen.config new/cscreen-1.1/configs/cscreen.config --- old/cscreen-0.8/configs/cscreen.config 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/configs/cscreen.config 2021-04-21 14:41:49.000000000 +0200 @@ -6,9 +6,6 @@ # -- list of allowed users: ---------- acladd admin root # ------------------------------------- -shell /bin/bash -# we need a *huge* scrollback buffer -defscrollback 20000 startup_message off @@ -38,4 +35,13 @@ ## Consoles ## log on +## automatically reconnect to remote hosts +zombie_timeout 11 ## +# +# defhstatus "ThisHost ttyS0" +# screen -t OtherHost /dev/ttyS0 115200 +# defhstatus "RemoteHOST IPMI" +# screen -t RemoteHost -L ipmitool -I lanplus -H remotehost -U username -P password sol activate +# defhstatus "ThisHost cscreen shell" +# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/configs/cscreen.sysconfig new/cscreen-1.1/configs/cscreen.sysconfig --- old/cscreen-0.8/configs/cscreen.sysconfig 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/configs/cscreen.sysconfig 2021-04-21 14:41:49.000000000 +0200 @@ -7,21 +7,6 @@ # SCREEN_OWNER="_cscreen" -## Type: string -## Default: "console" -# -# The session name of the screen session. -# Visible via 'screen -ls'. -# -SCREEN_NAME="console" - -## Type: string -## Default: "/etc/cscreenrc" -# -# Path to the configuration file. -# -SCREENRC="/etc/cscreenrc" - ## Type: integer(1:) ## Default: "2048" # @@ -29,11 +14,3 @@ # (set via ulimit -n) # SCREEN_FILE_LIMIT="2048" - -## Type: integer(1:) -## Default: "10000" -# -# The history scrollback buffer in lines. -# -SCREEN_HISTORY="10000" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/cscreen.spec new/cscreen-1.1/cscreen.spec --- old/cscreen-0.8/cscreen.spec 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/cscreen.spec 2021-04-21 14:41:49.000000000 +0200 @@ -38,14 +38,17 @@ Group: System/Management URL: https://github.com/openSUSE/cscreen Source: %{name}-%{version}.tar.xz +Source1: %{name}-rpmlintrc +BuildRequires: sudo Recommends: logrotate -Requires: mailx Requires: screen Requires: sudo -Requires(postun): /usr/bin/rm -# FIXME: use proper Requires(pre/post/preun/...) +Requires(pre): shadow +Requires(postun): coreutils +%if 0%{?has_systemd} +%else PreReq: %fillup_prereq -PreReq: shadow +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,15 +62,21 @@ %build # %install +> %{name}.files +if ! test -d %{_sysconfdir}/sudoers.d +then + echo '%%dir %{_sysconfdir}/sudoers.d' >> %{name}.files +fi mkdir -p %{buildroot}/%{_sbindir} -%if %{?has_systemd} +%if 0%{?has_systemd} install -Dm644 systemd/cscreen.service %{buildroot}/%{_unitdir}/%{name}d.service pushd %{buildroot}/%{_sbindir} ln -sf service %{buildroot}%{_sbindir}/rc%{name}d popd %else -install -Dm755 systemd/cscreen.init %{buildroot}/%{_sysconfdir}/init.d/cscreend +install -Dm644 configs/%{name}.sysconfig %{buildroot}/%{_fillupdir}/sysconfig.%{name} +install -Dm755 systemd/cscreen.init %{buildroot}/%{_sysconfdir}/init.d/%{name}d pushd %{buildroot}/%{_sbindir} ln -s %{_sysconfdir}/init.d/%{name}d rc%{name}d popd @@ -75,8 +84,8 @@ install -Dm640 configs/%{name}.config %{buildroot}/%{_sysconfdir}/%{name}rc install -Dm644 configs/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} -install -Dm644 configs/%{name}.sudoers %{buildroot}%{_sysconfdir}/sudoers.d/cscreen -install -Dm644 configs/%{name}.sysconfig %{buildroot}/%{_fillupdir}/sysconfig.%{name} +install -Dm644 configs/%{name}.sudoers %{buildroot}%{_sysconfdir}/sudoers.d/%{name} +install -Dm755 src/%{name}-shell %{buildroot}/%{_datadir}/%{name}/%{name}-shell install -Dm755 src/%{name} %{buildroot}/%{_bindir}/%{name} install -Dm755 src/%{name}_update_config.sh %{buildroot}/%{_bindir}/cscreen_update_config.sh @@ -85,7 +94,7 @@ mkdir -pm700 %{buildroot}/%{HOMEDIR}/.ssh %pre -%if %{?has_systemd} +%if 0%{?has_systemd} %service_add_pre %{name}d.service %endif getent group %{GROUPNAME} >/dev/null || groupadd -r %{GROUPNAME} @@ -103,22 +112,22 @@ -c "cscreen daemon user" %{USERNAME} $TTY_GROUP %post -%if %{?has_systemd} +%if 0%{?has_systemd} %service_add_post %{name}d.service %else %{fillup_and_insserv %{name}d } -%endif %fillup_only %{name} +%endif %preun -%if %{?has_systemd} +%if 0%{?has_systemd} %service_del_preun %{name}d.service %else %stop_on_removal %{name}d %endif %postun -%if %{?has_systemd} +%if 0%{?has_systemd} %if %{defined service_del_postun_without_restart} %service_del_postun_without_restart %{name}d.service %else @@ -126,6 +135,7 @@ %service_del_postun %{name}d.service %endif %else +DISABLE_RESTART_ON_UPDATE=yes %restart_on_update %{name}d %insserv_cleanup %endif @@ -136,26 +146,26 @@ fi fi -%files +%files -f %{name}.files %defattr(-,root,root) %doc docs/motd_example -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} > 1320 %license License %endif %{_bindir}/%{name} %{_bindir}/cscreen_update_config.sh -%if %{?has_systemd} -%{_unitdir}/cscreend.service +%{_datadir}/%{name} +%if 0%{?has_systemd} +%{_unitdir}/%{name}d.service %else -%{_sysconfdir}/init.d/cscreend +%attr(0644,root,root) %{_fillupdir}/sysconfig.%{name} +%{_sysconfdir}/init.d/%{name}d %endif %{_sbindir}/rc%{name}d -%attr(0750,root,root) %dir %{_sysconfdir}/sudoers.d -%attr(0640,root,root) %config %{_sysconfdir}/sudoers.d/cscreen +%attr(0640,root,root) %config %{_sysconfdir}/sudoers.d/%{name} %attr(755,%{USERNAME}, %{GROUPNAME}) %dir %{_localstatedir}/log/screen %attr(755,%{USERNAME}, %{GROUPNAME}) %dir %{_localstatedir}/log/screen/old -%attr(644,%{USERNAME}, %{GROUPNAME}) %{_fillupdir}/sysconfig.%{name} %attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR} %attr(700,%{USERNAME}, %{GROUPNAME}) %dir %{HOMEDIR}/.ssh %attr(644,%{USERNAME}, %{GROUPNAME}) %config(noreplace) %{_sysconfdir}/%{name}rc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/src/cscreen new/cscreen-1.1/src/cscreen --- old/cscreen-0.8/src/cscreen 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/src/cscreen 2021-04-21 14:41:49.000000000 +0200 @@ -1,32 +1,32 @@ #!/bin/sh -CUSER="_cscreen" - PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH +SCREEN_OWNER='_cscreen' +SCREEN_NAME='console' +SCREENRC='/etc/cscreenrc' + if [ -f "/etc/sysconfig/cscreen" ] ; then . /etc/sysconfig/cscreen fi -owner=${SCREEN_OWNER:=$CUSER} -sessionname=${SCREEN_NAME:=console} -CSCREENRC=${SCREENRC:="/etc/cscreenrc"} screen=/usr/bin/screen +stty=/usr/bin/stty # suid bit must be set in multiuser mode # passing the owner enforces multiuser mode and would # fail in certain situations if not root. # # We simply assume that the session is run as the same # user we are currently logged in as (probably _cscreen). -if [ "$owner" = "root" ] || [ -u "$screen" ];then - connect=$owner/$sessionname -elif [ "$owner" = "$CUSER" ];then - connect=$sessionname - screen="sudo -u $owner /usr/bin/screen" +if [ "$SCREEN_OWNER" = "root" ] || [ -u "$screen" ];then + connect=$SCREEN_OWNER/$SCREEN_NAME +elif [ "$SCREEN_OWNER" = "$SCREEN_OWNER" ];then + connect=$SCREEN_NAME + screen="sudo -u $SCREEN_OWNER $screen" else - echo "owner must be $CUSER or root user" + echo "owner must be $SCREEN_OWNER or root user" exit 1 fi @@ -46,27 +46,45 @@ echo "Connects to serial consoles, if a window name is passed as first parameter" echo "cscreen will try to put this window into foreground" echo - echo " -u Will update (add/kill/restart) windows by diffing /etc/cscreenrc and" - echo " /etc/cscreenrc.old. This parameter must only be used by orthos." + echo " -u Will update (add/kill/restart) windows by diffing '$SCREENRC' and" + echo " '$CSCREENRC_OLD'. This parameter must only be used by orthos." echo echo " -l Provides an overview of running windows and their state" exit 0 } +function run_screen() +{ + local rc stty_settings + + # The terminal interprets many characters which might be useful on the + # remote end. Unset everything but erase and let the remote system + # handle them. Restore settings when screen exits. + # Defaults: intr = ^C; quit = ^\; erase = ^?; kill = ^U; eof = ^D; + # eol = <undef>; eol2 = <undef>; swtch = <undef>; start = ^Q; + # stop = ^S; susp = ^Z; rprnt = ^R; werase = ^W; lnext = ^V; + # discard = ^O; + stty_settings="$($stty -g)" + $stty intr '' quit '' kill '' eof '' eol '' eol2 '' swtch '' start '' stop '' susp '' rprnt '' werase '' lnext '' discard '' + $screen "$@" + rc=$? + $stty $stty_settings + exit $rc +} + if [[ $# == 0 ]];then - exec $screen -x $connect -p = - exit 0 + run_screen -x $connect -p = elif [[ $# == 1 ]];then if [ "$1" == "-u" ]; then if [ -r "$UPDATE_ALLOWED_FILE" ] || [ "$FORCE_UPDATE" == 1 ];then - /usr/bin/cscreen_update_config.sh "$CSCREENRC_OLD" "$CSCREENRC" $connect + /usr/bin/cscreen_update_config.sh "$CSCREENRC_OLD" "$SCREENRC" $connect exit 0 else echo "$UPDATE_ALLOWED_FILE does not exist -> No update done" exit 1 fi elif [ "$1" == "-l" ]; then - window_list=`screen -r $connect -Q windows "%3n|%t|%f|%x#"` + window_list=`$screen -r $connect -Q windows "%3n|%t|%f|%x#"` IFS="#" echo "NO"$'\t'"TITLE"$'\t'$'\t'$'\t'"Flags" echo "Command" @@ -93,7 +111,7 @@ elif [ "$1" == "-h" ]; then usage else - exec $screen -x $connect -p $1 + run_screen -x $connect -p $1 fi else usage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/src/cscreen-shell new/cscreen-1.1/src/cscreen-shell --- old/cscreen-0.8/src/cscreen-shell 1970-01-01 01:00:00.000000000 +0100 +++ new/cscreen-1.1/src/cscreen-shell 2021-04-21 14:41:49.000000000 +0200 @@ -0,0 +1,4 @@ +#!/bin/bash +# undo the stty settings from cscreen for shells launched by screen +stty sane +exec bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/src/cscreen_update_config.sh new/cscreen-1.1/src/cscreen_update_config.sh --- old/cscreen-0.8/src/cscreen_update_config.sh 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/src/cscreen_update_config.sh 2021-04-21 14:41:49.000000000 +0200 @@ -12,6 +12,12 @@ # $2: New screenrc file (for example /etc/cscreenrc) # $3: The cscreen session to connect to (e.g. root/console or root/ppc) +SCREENRC='/etc/cscreenrc' + +if [ -f "/etc/sysconfig/cscreen" ] ; then + . /etc/sysconfig/cscreen +fi + DEBUG=0 function err_out() { @@ -38,7 +44,7 @@ # change defhstatus _host=$(echo $COMMAND | cut -d" " -f 3) - _status="$(sed -n "/${_host}/{n;p}" /etc/cscreenrc)" + _status="$(sed -n "/${_host}/{n;p}" $SCREENRC)" _status="$(echo $_status |sed 's/defhstatus "\(.*\)"/\1/')" echo $_host >> /tmp/cscreen.debug echo $_status >> /tmp/cscreen.debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/systemd/cscreen.init new/cscreen-1.1/systemd/cscreen.init --- old/cscreen-0.8/systemd/cscreen.init 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/systemd/cscreen.init 2021-04-21 14:41:49.000000000 +0200 @@ -28,6 +28,8 @@ SCREEN_OWNER='_cscreen' SCREEN_NAME='console' SCREENRC='/etc/cscreenrc' +SCREEN_HISTORY="20000" +SCREEN_SHELL='/usr/share/cscreen/cscreen-shell' sysconfig='/etc/sysconfig/cscreen' screen='/usr/bin/screen' pidfile='/var/run/cscreen.pid' @@ -78,7 +80,7 @@ 0) echo "already running " ;; *) - createcmd="(ulimit -n $SCREEN_FILE_LIMIT; $screen -wipe $SCREEN_NAME; $screen -d -m -S /$SCREEN_NAME -c $SCREENRC) < /dev/null > /dev/null 2>&1" + createcmd="(ulimit -n $SCREEN_FILE_LIMIT; $screen -wipe $SCREEN_NAME; $screen -h $SCREEN_HISTORY -s $SCREEN_SHELL -d -m -S $SCREEN_NAME -c $SCREENRC) < /dev/null > /dev/null 2>&1" su $SCREEN_OWNER -c "/bin/sh -c '$createcmd'" ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cscreen-0.8/systemd/cscreen.service new/cscreen-1.1/systemd/cscreen.service --- old/cscreen-0.8/systemd/cscreen.service 2020-09-18 09:01:38.000000000 +0200 +++ new/cscreen-1.1/systemd/cscreen.service 2021-04-21 14:41:49.000000000 +0200 @@ -1,15 +1,21 @@ [Unit] Description=Console screen -After=network.target autofs.service +After=local-fs.target [Service] Type=forking +Environment=SCREENRC='/etc/cscreenrc' +Environment=SCREEN_NAME='console' +Environment=SCREEN_HISTORY="20000" +Environment=SCREEN_SHELL='/usr/share/cscreen/cscreen-shell' EnvironmentFile=-/etc/sysconfig/cscreen -ExecStart=/usr/bin/screen -d -m -S $SCREEN_NAME -c $SCREENRC +ExecStart=/usr/bin/screen -h $SCREEN_HISTORY -s $SCREEN_SHELL -d -m -S $SCREEN_NAME -c $SCREENRC ExecReload=/bin/kill -HUP $MAINPID # This can be adjusted via "drop-in" directory cscreen.service.d/ (see systemd.unit(5)) User=_cscreen Group=_cscreen +# This can be adjusted via "drop-in" directory cscreen.service.d/ (see systemd.exec(5)) +LimitNOFILE=2048 [Install] WantedBy=multi-user.target ++++++ cscreen-rpmlintrc ++++++ addFilter('suse-logrotate-user-writable-log-dir') addFilter('non-conffile-in-etc') addFilter('hidden-file-or-dir')
