From e8fce685de8da3f00ede5f6479506ed7b0944f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 29 Sep 2016 10:17:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2?= =?UTF-8?q?=20backup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1-migrate/mail-mta/postfix/.calculate_directory | 2 +- .../1-migrate/net-im/ejabberd/.calculate_directory | 2 +- .../1-migrate/net-mail/dovecot/.calculate_directory | 3 +-- .../3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab | 2 +- .../app-admin/syslog-ng/.calculate_directory | 2 +- .../2_ac_install_merge/app-misc/screen/.calculate_directory | 2 +- .../3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory | 2 +- .../templates/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf | 2 +- .../3.4/2_ac_install_merge/app-portage/layman/layman.cfg | 2 +- .../templates/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm | 2 +- .../templates/3.4/2_ac_install_merge/media-gfx/gimp/99gimp | 1 + profiles/templates/3.4/2_ac_install_merge/net-im/skype/99skype | 1 + .../sys-apps/calculate-utils/30-update-cache | 1 + .../sys-apps/calculate-utils/40-fix-packages | 1 + .../sys-apps/calculate-utils/40-skip-configure | 1 + .../sys-apps/calculate-utils/50-patch-package | 1 + .../sys-apps/calculate-utils/50-post-setup-package | 1 + .../sys-apps/calculate-utils/50-server-distfiles | 2 +- .../sys-apps/calculate-utils/50-setup-package | 1 + .../2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 | 1 + .../3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ | 2 +- .../3.4/2_ac_install_merge/sys-apps/shadow/login.defs | 2 +- .../templates/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab | 2 +- profiles/templates/3.4/2_ac_install_merge/sys-auth/pambase/su | 1 + .../templates/3.4/2_ac_install_merge/sys-boot/grub/00_header | 2 +- .../templates/3.4/2_ac_install_merge/sys-boot/grub/10_linux | 2 +- .../3.4/2_ac_install_merge/sys-boot/grub/30_os-prober | 2 +- .../2_ac_install_merge/sys-devel/prelink/cron.daily/prelink | 2 +- .../3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules | 2 +- .../2_ac_install_merge/sys-kernel/calculate-sources/ksm.start | 2 +- profiles/templates/3.4/2_ac_install_merge/sys-libs/gpm/gpm | 1 + .../templates/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf | 1 + .../3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh | 2 +- .../3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc | 2 +- .../3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia | 1 + .../templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm | 2 +- .../3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter | 2 +- .../1-merge/mail-mta/postfix/.calculate_directory | 2 +- .../1-merge/media-sound/alsa-utils/asound.conf | 2 +- .../1-merge/media-sound/alsa-utils/asound.conf.old | 2 +- .../1-merge/net-im/ejabberd/.calculate_directory | 2 +- .../1-merge/net-mail/dovecot/.calculate_directory | 2 +- .../1-merge/net-misc/networkmanager/.calculate_directory | 2 +- .../3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync | 2 +- .../1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules | 2 +- .../3-desktop/install/lxde-base/lxdm/PostLogout | 2 +- .../3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre | 2 +- .../3-desktop/install/lxde-base/lxdm/PreLogin | 2 +- .../3-desktop/install/lxde-base/lxdm/PreReboot | 2 +- .../3-desktop/install/lxde-base/lxdm/PreShutdown | 2 +- .../3-desktop/install/lxde-base/lxdm/pam-lxdm | 2 +- .../3-desktop/uninstall/lxde-base/lxdm/PostLogout | 1 + .../3-desktop/uninstall/lxde-base/lxdm/PreLogin | 1 + .../3-desktop/uninstall/lxde-base/lxdm/PreReboot | 1 + .../3-desktop/uninstall/lxde-base/lxdm/PreShutdown | 1 + .../templates/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab | 2 +- .../3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab | 2 +- .../3.4/6_ac_builder_setup/sys-apps/shadow/login.defs | 2 +- .../3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs | 2 +- .../3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab | 2 +- .../1-migrate/mail-mta/postfix/.calculate_directory | 2 +- .../1-migrate/net-im/ejabberd/.calculate_directory | 2 +- .../1-migrate/net-mail/dovecot/.calculate_directory | 3 +-- .../3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab | 2 +- .../app-admin/syslog-ng/.calculate_directory | 2 +- .../2_ac_install_merge/app-misc/screen/.calculate_directory | 2 +- .../3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory | 2 +- .../templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf | 2 +- .../3.5/2_ac_install_merge/app-portage/layman/layman.cfg | 2 +- .../templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm | 2 +- .../3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout | 2 +- .../templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre | 2 +- .../3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin | 2 +- .../3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot | 2 +- .../3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown | 2 +- .../templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm | 2 +- .../templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp | 1 + profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype | 1 + .../sys-apps/calculate-utils/30-update-cache | 1 + .../sys-apps/calculate-utils/40-fix-packages | 1 + .../sys-apps/calculate-utils/40-skip-configure | 1 + .../sys-apps/calculate-utils/50-patch-package | 1 + .../sys-apps/calculate-utils/50-post-setup-package | 1 + .../sys-apps/calculate-utils/50-server-distfiles | 2 +- .../sys-apps/calculate-utils/50-setup-package | 1 + .../2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 | 1 + .../3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ | 2 +- .../3.5/2_ac_install_merge/sys-apps/shadow/login.defs | 2 +- .../templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab | 2 +- .../templates/3.5/2_ac_install_merge/sys-boot/grub/00_header | 2 +- .../templates/3.5/2_ac_install_merge/sys-boot/grub/10_linux | 2 +- .../3.5/2_ac_install_merge/sys-boot/grub/30_os-prober | 2 +- .../2_ac_install_merge/sys-devel/prelink/cron.daily/prelink | 2 +- .../3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules | 2 +- .../2_ac_install_merge/sys-kernel/calculate-sources/ksm.start | 2 +- profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm | 1 + .../templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf | 1 + .../3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh | 2 +- .../3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc | 2 +- .../3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia | 1 + .../1-merge/mail-mta/postfix/.calculate_directory | 2 +- .../1-merge/media-sound/alsa-utils/asound.conf | 2 +- .../1-merge/media-sound/alsa-utils/asound.conf.old | 2 +- .../1-merge/net-im/ejabberd/.calculate_directory | 3 +-- .../1-merge/net-mail/dovecot/.calculate_directory | 2 +- .../1-merge/net-misc/networkmanager/.calculate_directory | 2 +- .../3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync | 2 +- .../3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab | 2 +- .../1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules | 2 +- .../3.5/6_ac_builder_setup/sys-apps/shadow/login.defs | 2 +- .../3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs | 2 +- .../3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab | 2 +- 112 files changed, 112 insertions(+), 86 deletions(-) diff --git a/profiles/templates/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory b/profiles/templates/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory index 0ff298a45..718d88e66 100644 --- a/profiles/templates/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory +++ b/profiles/templates/3.4/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate pkg()!= path=/etc/ssl/postfix +# Calculate pkg()!= path=/etc/ssl diff --git a/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory b/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory index d92577f0a..718d88e66 100644 --- a/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory +++ b/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate pkg()!= path=/etc/ssl/ejabberd +# Calculate pkg()!= path=/etc/ssl diff --git a/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory b/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory index 35be6fbe0..e5128c61b 100644 --- a/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory +++ b/profiles/templates/3.4/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory @@ -1,2 +1 @@ -# Calculate pkg()!= path=/etc/ssl/dovecot - +# Calculate pkg()!= path=/etc/ssl diff --git a/profiles/templates/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab b/profiles/templates/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab index b3862215e..896961723 100644 --- a/profiles/templates/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.4/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch ^#(s[01]) \1 (c[0-9]:.*agetty).*(tty\d linux) diff --git a/profiles/templates/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory index c2c200253..5e0caa52e 100644 --- a/profiles/templates/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory +++ b/profiles/templates/3.4/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate append=skip merge()!=&&pkg()!= diff --git a/profiles/templates/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory b/profiles/templates/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory index 71933aab5..8aff98b40 100644 --- a/profiles/templates/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory +++ b/profiles/templates/3.4/2_ac_install_merge/app-misc/screen/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate append=skip merge()!=&&pkg()!= diff --git a/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory b/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory index 71933aab5..54dccd632 100644 --- a/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory +++ b/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate merge()!=&&pkg()!= path=/ name=etc diff --git a/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf b/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf index 62686c8dc..c120effe5 100644 --- a/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf +++ b/profiles/templates/3.4/2_ac_install_merge/app-misc/tmux/tmux.conf @@ -1,4 +1,4 @@ -# Calculate comment=# path=/etc +# Calculate comment=# set -g default-terminal "screen-256color" set -g history-limit 10000 #set-window-option -g utf8 on diff --git a/profiles/templates/3.4/2_ac_install_merge/app-portage/layman/layman.cfg b/profiles/templates/3.4/2_ac_install_merge/app-portage/layman/layman.cfg index c56290d69..d9d2f273f 100644 --- a/profiles/templates/3.4/2_ac_install_merge/app-portage/layman/layman.cfg +++ b/profiles/templates/3.4/2_ac_install_merge/app-portage/layman/layman.cfg @@ -1,3 +1,3 @@ -# Calculate format=patch multiline merge(app-portage/layman)!= +# Calculate comment=# format=patch multiline merge(app-portage/layman)!= ^#?(git_command\s*:\s*)/.*$ \1/usr/libexec/calculate/cl-git-wrapper diff --git a/profiles/templates/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm b/profiles/templates/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm index 3cba2fae8..d6b1c6d11 100644 --- a/profiles/templates/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm +++ b/profiles/templates/3.4/2_ac_install_merge/lxde-base/lxdm/90lxdm @@ -1,3 +1,3 @@ -# Calculate path=/etc/env.d +# Calculate comment=# path=/etc/env.d DESKTOP="xfce" diff --git a/profiles/templates/3.4/2_ac_install_merge/media-gfx/gimp/99gimp b/profiles/templates/3.4/2_ac_install_merge/media-gfx/gimp/99gimp index 615128e09..82806183b 100644 --- a/profiles/templates/3.4/2_ac_install_merge/media-gfx/gimp/99gimp +++ b/profiles/templates/3.4/2_ac_install_merge/media-gfx/gimp/99gimp @@ -1,3 +1,4 @@ +# Calculate comment=# # discard /usr/lib64/gimp/2.0/plug-ins/hot due to an segfault prelink # prelink (20110106-20110511), gimp (2.6.11) (CLD-64) PRELINK_PATH_MASK=/usr/lib64/gimp/2.0/plug-ins/hot diff --git a/profiles/templates/3.4/2_ac_install_merge/net-im/skype/99skype b/profiles/templates/3.4/2_ac_install_merge/net-im/skype/99skype index 30b9fc502..dbaf71624 100644 --- a/profiles/templates/3.4/2_ac_install_merge/net-im/skype/99skype +++ b/profiles/templates/3.4/2_ac_install_merge/net-im/skype/99skype @@ -1,2 +1,3 @@ +# Calculate comment=# # discard /opt/bin/skype, because prelink call segfault PRELINK_PATH_MASK=/opt/bin/skype diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache index 2189eb2e6..0bd11ecac 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages index 9c7803dc6..ad628aaea 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure index 61cdbc69f..08c51dc2c 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package index 1aac76c21..c07828ff6 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package index e8abe408f..7be0bf02b 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles index faba04185..2a5cddf5f 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles @@ -1,4 +1,4 @@ -# Calculate pkg(sys-apps/calculate-server)!= +# Calculate comment=# pkg(sys-apps/calculate-server)!= # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package index c9b0bd692..de422728c 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 index 4a7ab7fff..9963c6bb4 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ index 33ad258a8..13858ede0 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh exec tail -n +3 $0 diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/shadow/login.defs b/profiles/templates/3.4/2_ac_install_merge/sys-apps/shadow/login.defs index bc80a3d02..66f7b6c5f 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/shadow/login.defs +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/shadow/login.defs @@ -1,4 +1,4 @@ -# Calculate format=patch path=/etc +# Calculate comment=# format=patch path=/etc ENV_SUPATH\tPATH=/sbin:/bin:/usr/sbin:/usr/bin diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab b/profiles/templates/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab index 92b912acb..b9544a1e0 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch (si::sysinit:/sbin/(?:open)?rc sysinit ) (# Further system initialization, brings up the boot runlevel.) diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-auth/pambase/su b/profiles/templates/3.4/2_ac_install_merge/sys-auth/pambase/su index 8b1c9e7c9..bba6bd36e 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-auth/pambase/su +++ b/profiles/templates/3.4/2_ac_install_merge/sys-auth/pambase/su @@ -1,3 +1,4 @@ +# Calculate comment=# #%PAM-1.0 auth sufficient pam_rootok.so diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/00_header b/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/00_header index 630070eb7..7a5fcd7fb 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/00_header +++ b/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/00_header @@ -1 +1 @@ -# Calculate format=patch autoupdate path=/etc/grub.d +# Calculate comment=# format=patch autoupdate path=/etc/grub.d diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/10_linux b/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/10_linux index 19f759bf1..8011438e4 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/10_linux +++ b/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/10_linux @@ -1,4 +1,4 @@ -# Calculate multiline format=patch autoupdate path=/etc/grub.d +# Calculate comment=# multiline format=patch autoupdate path=/etc/grub.d (replacement_title=.*?Advanced options.*?)g'\)" \1g') ..." ("submenu '.*?Advanced options for.*?grub_quote\))' diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober b/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober index 19f759bf1..8011438e4 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober +++ b/profiles/templates/3.4/2_ac_install_merge/sys-boot/grub/30_os-prober @@ -1,4 +1,4 @@ -# Calculate multiline format=patch autoupdate path=/etc/grub.d +# Calculate comment=# multiline format=patch autoupdate path=/etc/grub.d (replacement_title=.*?Advanced options.*?)g'\)" \1g') ..." ("submenu '.*?Advanced options for.*?grub_quote\))' diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink b/profiles/templates/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink index cf986bac4..14ebfe5f6 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink +++ b/profiles/templates/3.4/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink @@ -1,3 +1,3 @@ -# Calculate format=patch +# Calculate comment=# format=patch \n(\[ -n "\$\(find `ldd /sbin/init .*/sbin/telinit u) \n#\1 diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules b/profiles/templates/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules index 8dec3f8a6..ecdb88772 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules +++ b/profiles/templates/3.4/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules @@ -1,4 +1,4 @@ -# Calculate append=replace path=/etc/polkit-1/rules.d +# Calculate comment=// append=replace path=/etc/polkit-1/rules.d /* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ // Mount disk by plugdev group rules for polkit diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start b/profiles/templates/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start index 410799a17..4642ab21b 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start +++ b/profiles/templates/3.4/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start @@ -1,4 +1,4 @@ -# Calculate chmod=755 +# Calculate comment=# chmod=755 #!/bin/bash F=/sys/kernel/mm/ksm/run diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-libs/gpm/gpm b/profiles/templates/3.4/2_ac_install_merge/sys-libs/gpm/gpm index e8b9f0fef..5d7112a3f 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-libs/gpm/gpm +++ b/profiles/templates/3.4/2_ac_install_merge/sys-libs/gpm/gpm @@ -1,2 +1,3 @@ +# Calculate comment=# MOUSE=imps2 MOUSEDEV=/dev/psaux diff --git a/profiles/templates/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf b/profiles/templates/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf index 1cd54881a..681f00b8e 100644 --- a/profiles/templates/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf +++ b/profiles/templates/3.4/2_ac_install_merge/sys-libs/pam/CDS.conf @@ -1,2 +1,3 @@ +# Calculate comment=# # need for openldap * - nofile 10240 diff --git a/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh b/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh index 3361d258e..85d3f31ab 100644 --- a/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh +++ b/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh @@ -1,3 +1,3 @@ -# Calculate format=patch +# Calculate comment=# format=patch \$\{START_STOP_ARGS\} \|\| ${START_STOP_ARGS} </dev/null || diff --git a/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc b/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc index ef86f6fdf..e6e0f44fa 100644 --- a/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc +++ b/profiles/templates/3.4/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc @@ -1,3 +1,3 @@ -# Calculate dotall format=patch +# Calculate comment=# dotall format=patch ^\s* diff --git a/profiles/templates/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia b/profiles/templates/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia index 950db071d..c83ce802e 100644 --- a/profiles/templates/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia +++ b/profiles/templates/3.4/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia @@ -1,3 +1,4 @@ +# Calculate comment=# # discard /usr/lib64/*nvidia*, because prelink call segfault # for some applications (chromium,libreoffice and etc) #?os_install_arch_machine==x86_64# diff --git a/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm b/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm index 36ebd52a1..f5c90b14f 100644 --- a/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm +++ b/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm @@ -1,4 +1,4 @@ -# Calculate path=/etc/pam.d name=lightdm +# Calculate comment=# path=/etc/pam.d name=lightdm #%PAM-1.0 auth optional pam_env.so auth include system-login diff --git a/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter b/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter index 6da6cdee9..7b8cde923 100644 --- a/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter +++ b/profiles/templates/3.4/2_ac_install_merge/x11-misc/lightdm/lightdm-greeter @@ -1,4 +1,4 @@ -# Calculate +# Calculate comment=# #%PAM-1.0 # Load environment from /etc/environment and ~/.pam_environment diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory b/profiles/templates/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory index 49c5f6c08..2523a9fd4 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl/postfix +# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf b/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf index f1ac50b28..688fad0c8 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf @@ -1,4 +1,4 @@ -# Calculate protected cl_ver>=3.4.7 +# Calculate comment=# protected cl_ver>=3.4.7 #?os_audio==alsa# defaults.ctl.card #-os_audio_default-# defaults.pcm.card #-os_audio_default-# diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old b/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old index 830d86eee..949249cd2 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old @@ -1,4 +1,4 @@ -# Calculate name=asound.conf protected os_audio_default_set==on&&cl_ver<3.4.7||pkg(media-sound/pulseaudio)!=&&cl_ver<3.4.7 +# Calculate comment=# name=asound.conf protected os_audio_default_set==on&&cl_ver<3.4.7||pkg(media-sound/pulseaudio)!=&&cl_ver<3.4.7 #?pkg(media-sound/pulseaudio)!=# pcm.pulse { type pulse diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory b/profiles/templates/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory index e67b0b594..08c00dfd9 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl/ejabberd +# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory b/profiles/templates/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory index c6165e215..08c00dfd9 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl/dovecot +# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory b/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory index c2c200253..5e0caa52e 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate append=skip merge()!=&&pkg()!= diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync b/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync index b6d1ce9ab..9e4f2b13a 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/net-misc/ntp/clocksync @@ -1,4 +1,4 @@ -# Calculate os_install_ntp!= chmod=0755 +# Calculate comment=# os_install_ntp!= chmod=0755 #!/bin/sh /usr/sbin/ntpdate -u #-os_install_ntp-# &>/dev/null diff --git a/profiles/templates/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules index 5aa84c702..daf2dd627 100644 --- a/profiles/templates/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules +++ b/profiles/templates/3.4/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules @@ -1,4 +1,4 @@ -# Calculate path=/etc/polkit-1/rules.d pkg(xfce-base/xfce4-session)!= +# Calculate comment=// path=/etc/polkit-1/rules.d pkg(xfce-base/xfce4-session)!= /* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ // Allow to use the suspend and the hibernation with block session in XFCE diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout index 95e8b0eff..dc1b4cf41 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PostLogout @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # /usr/bin/sessreg -d -l $DISPLAY $USER diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre index 19fa9b8d9..a9fe03ac0 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/Pre @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # if pgrep -f 'xdm/xdm --logout' diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin index 83e046b15..8fcfc9c2b 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreLogin @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # bash -c "/usr/bin/sessreg -a -l $DISPLAY $USER &" & diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot index cc4c36992..4e0bc3f2c 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreReboot @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # sleep 1 diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown index cc4c36992..4e0bc3f2c 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/PreShutdown @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # sleep 1 diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm index 5ed7c14b0..1831efca2 100644 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/install/lxde-base/lxdm/pam-lxdm @@ -1,4 +1,4 @@ -# Calculate path=/etc/pam.d name=lxdm +# Calculate comment=# path=/etc/pam.d name=lxdm #%PAM-1.0 auth optional pam_env.so auth include system-login diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout index b6e4239ec..c162faaa8 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PostLogout @@ -1,3 +1,4 @@ +# Calculate comment=# #!/bin/sh # # Note: this is a sample and will not be run as is. diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin index b6e4239ec..c162faaa8 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreLogin @@ -1,3 +1,4 @@ +# Calculate comment=# #!/bin/sh # # Note: this is a sample and will not be run as is. diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot index b6e4239ec..c162faaa8 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreReboot @@ -1,3 +1,4 @@ +# Calculate comment=# #!/bin/sh # # Note: this is a sample and will not be run as is. diff --git a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown index b6e4239ec..c162faaa8 100755 --- a/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown +++ b/profiles/templates/3.4/3_ac_install_live/3-desktop/uninstall/lxde-base/lxdm/PreShutdown @@ -1,3 +1,4 @@ +# Calculate comment=# #!/bin/sh # # Note: this is a sample and will not be run as is. diff --git a/profiles/templates/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab b/profiles/templates/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab index 93c420efb..7c8f5b028 100644 --- a/profiles/templates/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.4/5_ac_client_domain/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch (rc::bootwait:/sbin/(?:open)?rc boot )(l0:0:wait:/sbin/(?:open)?rc shutdown) diff --git a/profiles/templates/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab b/profiles/templates/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab index bad59d024..72517bd87 100644 --- a/profiles/templates/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.4/5_ac_client_undomain/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch l06:06:wait:/usr/sbin/logout diff --git a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs index f4d0bde99..0b0ec5200 100644 --- a/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs +++ b/profiles/templates/3.4/6_ac_builder_setup/sys-apps/shadow/login.defs @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch GID_MIN.* diff --git a/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs b/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs index 73cebc975..01346c074 100644 --- a/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs +++ b/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch GID_MIN.* diff --git a/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab b/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab index 4e7f61a9a..68a1592e0 100644 --- a/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.4/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch ^(s[01]) #\1 (c[0-9]:.*agetty).*(tty\d linux) diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory b/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory index 0ff298a45..718d88e66 100644 --- a/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory +++ b/profiles/templates/3.5/1_ac_install_disk/1-migrate/mail-mta/postfix/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate pkg()!= path=/etc/ssl/postfix +# Calculate pkg()!= path=/etc/ssl diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory b/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory index d92577f0a..718d88e66 100644 --- a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory +++ b/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-im/ejabberd/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate pkg()!= path=/etc/ssl/ejabberd +# Calculate pkg()!= path=/etc/ssl diff --git a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory b/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory index 35be6fbe0..e5128c61b 100644 --- a/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory +++ b/profiles/templates/3.5/1_ac_install_disk/1-migrate/net-mail/dovecot/.calculate_directory @@ -1,2 +1 @@ -# Calculate pkg()!= path=/etc/ssl/dovecot - +# Calculate pkg()!= path=/etc/ssl diff --git a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab b/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab index b3862215e..896961723 100644 --- a/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.5/1_ac_install_disk/2-system/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch ^#(s[01]) \1 (c[0-9]:.*agetty).*(tty\d linux) diff --git a/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory b/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory index c2c200253..5e0caa52e 100644 --- a/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory +++ b/profiles/templates/3.5/2_ac_install_merge/app-admin/syslog-ng/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate append=skip merge()!=&&pkg()!= diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory b/profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory index 71933aab5..8aff98b40 100644 --- a/profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory +++ b/profiles/templates/3.5/2_ac_install_merge/app-misc/screen/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate append=skip merge()!=&&pkg()!= diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory b/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory index 71933aab5..54dccd632 100644 --- a/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory +++ b/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate merge()!=&&pkg()!= path=/ name=etc diff --git a/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf b/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf index 62686c8dc..c120effe5 100644 --- a/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf +++ b/profiles/templates/3.5/2_ac_install_merge/app-misc/tmux/tmux.conf @@ -1,4 +1,4 @@ -# Calculate comment=# path=/etc +# Calculate comment=# set -g default-terminal "screen-256color" set -g history-limit 10000 #set-window-option -g utf8 on diff --git a/profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg b/profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg index c56290d69..d9d2f273f 100644 --- a/profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg +++ b/profiles/templates/3.5/2_ac_install_merge/app-portage/layman/layman.cfg @@ -1,3 +1,3 @@ -# Calculate format=patch multiline merge(app-portage/layman)!= +# Calculate comment=# format=patch multiline merge(app-portage/layman)!= ^#?(git_command\s*:\s*)/.*$ \1/usr/libexec/calculate/cl-git-wrapper diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm index 3cba2fae8..d6b1c6d11 100644 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/90lxdm @@ -1,3 +1,3 @@ -# Calculate path=/etc/env.d +# Calculate comment=# path=/etc/env.d DESKTOP="xfce" diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout index 25b764fad..0faafc1fe 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PostLogout @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh #?module(desktop)!=# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre index 37ec1a321..28a87e1ea 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/Pre @@ -1,4 +1,4 @@ -# Calculate chmod=0755 module(desktop)!= +# Calculate comment=# chmod=0755 module(desktop)!= #!/bin/sh # if pgrep -f 'xdm/xdm --logout' diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin index 6a32fb3c5..08064f503 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreLogin @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh r #?module(desktop)!=# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot index 0b9ffbd1b..6ed4ae15b 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreReboot @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # #?module(desktop)!=# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown index 0b9ffbd1b..6ed4ae15b 100755 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/lxdm/PreShutdown @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh # #?module(desktop)!=# diff --git a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm index 5ed7c14b0..1831efca2 100644 --- a/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm +++ b/profiles/templates/3.5/2_ac_install_merge/lxde-base/lxdm/pam-lxdm @@ -1,4 +1,4 @@ -# Calculate path=/etc/pam.d name=lxdm +# Calculate comment=# path=/etc/pam.d name=lxdm #%PAM-1.0 auth optional pam_env.so auth include system-login diff --git a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp b/profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp index 615128e09..82806183b 100644 --- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp +++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/gimp/99gimp @@ -1,3 +1,4 @@ +# Calculate comment=# # discard /usr/lib64/gimp/2.0/plug-ins/hot due to an segfault prelink # prelink (20110106-20110511), gimp (2.6.11) (CLD-64) PRELINK_PATH_MASK=/usr/lib64/gimp/2.0/plug-ins/hot diff --git a/profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype b/profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype index 30b9fc502..dbaf71624 100644 --- a/profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype +++ b/profiles/templates/3.5/2_ac_install_merge/net-im/skype/99skype @@ -1,2 +1,3 @@ +# Calculate comment=# # discard /opt/bin/skype, because prelink call segfault PRELINK_PATH_MASK=/opt/bin/skype diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache index 2189eb2e6..0bd11ecac 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/30-update-cache @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages index 9c7803dc6..ad628aaea 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-fix-packages @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure index 61cdbc69f..08c51dc2c 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/40-skip-configure @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package index 1aac76c21..c07828ff6 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package index e8abe408f..7be0bf02b 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles index faba04185..2a5cddf5f 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-server-distfiles @@ -1,4 +1,4 @@ -# Calculate pkg(sys-apps/calculate-server)!= +# Calculate comment=# pkg(sys-apps/calculate-server)!= # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package index c9b0bd692..de422728c 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # Copyright 2014-2015 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 index 4a7ab7fff..9963c6bb4 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/60-fix-libdb_6 @@ -1,3 +1,4 @@ +# Calculate comment=# # vim: set syntax=sh # # Copyright 2014 Calculate Ltd. http://www.calculate-linux.org diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ index 33ad258a8..13858ede0 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/memtest86+/39_memtest86+ @@ -1,4 +1,4 @@ -# Calculate chmod=0755 +# Calculate comment=# chmod=0755 #!/bin/sh exec tail -n +3 $0 diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/login.defs b/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/login.defs index bc80a3d02..66f7b6c5f 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/login.defs +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/shadow/login.defs @@ -1,4 +1,4 @@ -# Calculate format=patch path=/etc +# Calculate comment=# format=patch path=/etc ENV_SUPATH\tPATH=/sbin:/bin:/usr/sbin:/usr/bin diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab b/profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab index 92b912acb..b9544a1e0 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch (si::sysinit:/sbin/(?:open)?rc sysinit ) (# Further system initialization, brings up the boot runlevel.) diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/00_header b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/00_header index 630070eb7..7a5fcd7fb 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/00_header +++ b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/00_header @@ -1 +1 @@ -# Calculate format=patch autoupdate path=/etc/grub.d +# Calculate comment=# format=patch autoupdate path=/etc/grub.d diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/10_linux b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/10_linux index 19f759bf1..8011438e4 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/10_linux +++ b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/10_linux @@ -1,4 +1,4 @@ -# Calculate multiline format=patch autoupdate path=/etc/grub.d +# Calculate comment=# multiline format=patch autoupdate path=/etc/grub.d (replacement_title=.*?Advanced options.*?)g'\)" \1g') ..." ("submenu '.*?Advanced options for.*?grub_quote\))' diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/30_os-prober b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/30_os-prober index 19f759bf1..8011438e4 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/30_os-prober +++ b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/30_os-prober @@ -1,4 +1,4 @@ -# Calculate multiline format=patch autoupdate path=/etc/grub.d +# Calculate comment=# multiline format=patch autoupdate path=/etc/grub.d (replacement_title=.*?Advanced options.*?)g'\)" \1g') ..." ("submenu '.*?Advanced options for.*?grub_quote\))' diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink b/profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink index cf986bac4..14ebfe5f6 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink +++ b/profiles/templates/3.5/2_ac_install_merge/sys-devel/prelink/cron.daily/prelink @@ -1,3 +1,3 @@ -# Calculate format=patch +# Calculate comment=# format=patch \n(\[ -n "\$\(find `ldd /sbin/init .*/sbin/telinit u) \n#\1 diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules b/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules index 8dec3f8a6..ecdb88772 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules +++ b/profiles/templates/3.5/2_ac_install_merge/sys-fs/udisks/50-mount-disk.rules @@ -1,4 +1,4 @@ -# Calculate append=replace path=/etc/polkit-1/rules.d +# Calculate comment=// append=replace path=/etc/polkit-1/rules.d /* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ // Mount disk by plugdev group rules for polkit diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start b/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start index 410799a17..4642ab21b 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start +++ b/profiles/templates/3.5/2_ac_install_merge/sys-kernel/calculate-sources/ksm.start @@ -1,4 +1,4 @@ -# Calculate chmod=755 +# Calculate comment=# chmod=755 #!/bin/bash F=/sys/kernel/mm/ksm/run diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm b/profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm index e8b9f0fef..5d7112a3f 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm +++ b/profiles/templates/3.5/2_ac_install_merge/sys-libs/gpm/gpm @@ -1,2 +1,3 @@ +# Calculate comment=# MOUSE=imps2 MOUSEDEV=/dev/psaux diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf b/profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf index 1cd54881a..681f00b8e 100644 --- a/profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf +++ b/profiles/templates/3.5/2_ac_install_merge/sys-libs/pam/CDS.conf @@ -1,2 +1,3 @@ +# Calculate comment=# # need for openldap * - nofile 10240 diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh b/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh index 3361d258e..85d3f31ab 100644 --- a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh +++ b/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh @@ -1,3 +1,3 @@ -# Calculate format=patch +# Calculate comment=# format=patch \$\{START_STOP_ARGS\} \|\| ${START_STOP_ARGS} </dev/null || diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc b/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc index ef86f6fdf..e6e0f44fa 100644 --- a/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc +++ b/profiles/templates/3.5/2_ac_install_merge/x11-apps/xinit/X11/xinit/xinitrc @@ -1,3 +1,3 @@ -# Calculate dotall format=patch +# Calculate comment=# dotall format=patch ^\s* diff --git a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia b/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia index 950db071d..c83ce802e 100644 --- a/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia +++ b/profiles/templates/3.5/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia @@ -1,3 +1,4 @@ +# Calculate comment=# # discard /usr/lib64/*nvidia*, because prelink call segfault # for some applications (chromium,libreoffice and etc) #?os_install_arch_machine==x86_64# diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory b/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory index 49c5f6c08..2523a9fd4 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/mail-mta/postfix/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl/postfix +# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf b/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf index f1ac50b28..688fad0c8 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf @@ -1,4 +1,4 @@ -# Calculate protected cl_ver>=3.4.7 +# Calculate comment=# protected cl_ver>=3.4.7 #?os_audio==alsa# defaults.ctl.card #-os_audio_default-# defaults.pcm.card #-os_audio_default-# diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old b/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old index 79b3d3414..4e3b323b7 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/media-sound/alsa-utils/asound.conf.old @@ -1,4 +1,4 @@ -# Calculate protected name=asound.conf os_audio_default_set==on&&cl_ver<3.4.7||pkg(media-sound/pulseaudio)!=&&cl_ver<3.4.7 +# Calculate comment=# protected name=asound.conf os_audio_default_set==on&&cl_ver<3.4.7||pkg(media-sound/pulseaudio)!=&&cl_ver<3.4.7 #?pkg(media-sound/pulseaudio)!=# pcm.pulse { type pulse diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory b/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory index e67b0b594..2523a9fd4 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/net-im/ejabberd/.calculate_directory @@ -1,2 +1 @@ -# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl/ejabberd - +# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory b/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory index c6165e215..08c00dfd9 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/net-mail/dovecot/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl/dovecot +# Calculate merge()!=&&pkg()!=&&os_install_root_type==livecd path=/etc/ssl diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory b/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory index c2c200253..d9ce8789a 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/networkmanager/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate merge()!=&&pkg()!= path=/etc +# Calculate append=skip merge()!=&&pkg()!= path=/etc diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync b/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync index b6d1ce9ab..9e4f2b13a 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/net-misc/ntp/clocksync @@ -1,4 +1,4 @@ -# Calculate os_install_ntp!= chmod=0755 +# Calculate comment=# os_install_ntp!= chmod=0755 #!/bin/sh /usr/sbin/ntpdate -u #-os_install_ntp-# &>/dev/null diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab index 73a40e92f..c16e1503f 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch #?module(client)!=&&client.os_remote_auth!=# (rc::bootwait:/sbin/(?:open)?rc boot diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules index 5aa84c702..daf2dd627 100644 --- a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules +++ b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-power/upower-pm-utils/80-upower-suspend.rules @@ -1,4 +1,4 @@ -# Calculate path=/etc/polkit-1/rules.d pkg(xfce-base/xfce4-session)!= +# Calculate comment=// path=/etc/polkit-1/rules.d pkg(xfce-base/xfce4-session)!= /* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ // Allow to use the suspend and the hibernation with block session in XFCE diff --git a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs b/profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs index f4d0bde99..0b0ec5200 100644 --- a/profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs +++ b/profiles/templates/3.5/6_ac_builder_setup/sys-apps/shadow/login.defs @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch GID_MIN.* diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs b/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs index 73cebc975..01346c074 100644 --- a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs +++ b/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/shadow/login.defs @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch GID_MIN.* diff --git a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab b/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab index 4e7f61a9a..68a1592e0 100644 --- a/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab +++ b/profiles/templates/3.5/6_ac_builder_squash/1_setup/sys-apps/sysvinit/inittab @@ -1,4 +1,4 @@ -# Calculate format=patch +# Calculate comment=# format=patch ^(s[01]) #\1 (c[0-9]:.*agetty).*(tty\d linux)