Bug 151685 – dispatch-conf - freeze config files

• Status: RESOLVED FIXED
• Product: Portage Development

[Description Bo Ørsted Andresen (RETIRED) 2006-10-17 02:58:46 UTC]

This is derived from bug #68618 comment #5:

add files to a new option in dispatch-conf.conf to prevent
config files from being overwritten, instead the new file from portage will be
added to rcs (or whatever other system of archiving you have dispatch-conf set
up to use) so you don't "lose" the changes. the list is a space dilimeted list
of files to be "frozen". example of the line in dispatch-conf:
frozen="/etc/fstab /etc/passwd /etc/group"
those files will be "frozen" and therefore never be overwritten by
dispatch-conf.

[Comment 1 Bo Ørsted Andresen (RETIRED) 2006-10-17 02:59:46 UTC]

Created attachment 99865 [details, diff]
add support to freeze files via frozen variable in dispatch-conf.conf

[Comment 2 Bo Ørsted Andresen (RETIRED) 2006-10-17 03:30:35 UTC]

Forgot to mention that I've tested it on this system:

Portage 2.1.2_pre3-r2 (default-linux/x86/2006.1/desktop, gcc-4.1.1, glibc-2.4-r3, 2.6.17-suspend2-r5 i686)
=================================================================
System uname: 2.6.17-suspend2-r5 i686 Intel(R) Pentium(R) M processor 1600MHz
Gentoo Base System version 1.12.5
Last Sync: Mon, 16 Oct 2006 00:00:01 +0000
ccache version 2.3 [enabled]
app-admin/eselect-compiler: [Not Present]
dev-java/java-config: 1.3.7, 2.0.30
dev-lang/python:     2.4.3-r4
dev-python/pycrypto: 2.0.1-r5
dev-util/ccache:     2.3
dev-util/confcache:  [Not Present]
sys-apps/sandbox:    1.2.17
sys-devel/autoconf:  2.13, 2.60
sys-devel/automake:  1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2
sys-devel/binutils:  2.16.1-r3
sys-devel/gcc-config: 1.3.13-r4
sys-devel/libtool:   1.5.22
virtual/os-headers:  2.6.17-r1
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-march=pentium-m -Os -pipe"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/X11/xkb /usr/share/config /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/"
CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/gconf /etc/java-config/vms/ /etc/revdep-rebuild /etc/splash /etc/terminfo"
CXXFLAGS="-march=pentium-m -Os -pipe"
DISTDIR="/opt/distfiles"
FEATURES="autoconfig buildpkg ccache collision-protect distlocks fixpackages metadata-transfer parallel-fetch sandbox sfperms splitdebug strict test userfetch"
GENTOO_MIRRORS="http://mirror.uni-c.dk/pub/gentoo http://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo"
LC_ALL="da_DK.utf8"
LINGUAS="da en en_GB"
MAKEOPTS="-j2"
PKGDIR="/opt/packages"
PORTAGE_RSYNC_EXTRA_OPTS="--timeout=60"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://zlin.dk/gentoo-portage"
USE="x86 X aac acpi aiglx alsa asf avahi bash-completion berkdb bitmap-fonts bluetooth bzip2 cairo cdr cli crypt css cups dlloader dri dvd dvdr elibc_glibc emboss encode fam fat fbcon ffmpeg firefox flac fortran gdbm gif gnokii gphoto2 gpm hal i8x0 ieee1394 imagemagick input_devices_evdev input_devices_keyboard input_devices_mouse input_devices_synaptics input_devices_void irda irmc isdnlog jfs jpeg kcal kde kdehiddenvisibility kernel_linux lcd libg++ linguas_da linguas_en linguas_en_GB lm_sensors logitech-mouse mad mikmod mmx mmxext mp3 mpeg mplayer msn musicbrainz ncurses network nls nptl nptlonly nsplugin ntfs ogg opengl pam pcre pdf perl png ppds pppd python qt3 quicktime rdesktop readline real reflection reiser4 reiserfs scanner sdl session slp sms spell spl sse sse2 ssl subversion svg svga syslog tcpd test tetex tiff truetype truetype-fonts type1-fonts udev unicode usb userland_GNU vcd video_cards_fbdev video_cards_fglrx video_cards_i810 video_cards_radeon video_cards_vesa vim vorbis wifi win32codecs xcomposite xfs xine xml xorg xscreensaver xv xvid zlib"
Unset:  CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LDFLAGS

[Comment 3 Zac Medico 2006-10-19 04:36:47 UTC]

Isn't the general policy of dispatch-conf to keep an archived copy of the of the file if the user rejects it?  That's what I would expect here, but the patch simply causes the file to be remove.

[Comment 4 Bo Ørsted Andresen (RETIRED) 2006-10-29 13:17:01 UTC]

Created attachment 100740 [details, diff]
frozen files

(In reply to comment #3)
> Isn't the general policy of dispatch-conf to keep an archived copy of the of
> the file if the user rejects it?  That's what I would expect here, but the
> patch simply causes the file to be remove.

AFAICT dispatch-conf does not archive a copy if the user rejects a file manually with zap. I do agree that it's a good idea for this purpose though. I hope the attached patch is appropriate (have to admit I'm not entirely certain)..

[Comment 5 Zac Medico 2006-10-31 05:54:47 UTC]

Thanks for the patches.  This feature is now in svn r4887.  It behaves exactly like an automatic zap.  Zapped updates are archived with a .new extension which indicates that they haven't been merged into the current config (zapped updates have always been archived like this, actually).

[Comment 6 Bo Ørsted Andresen (RETIRED) 2006-10-31 07:07:47 UTC]

Thanks!

[Comment 7 Zac Medico 2006-11-01 00:30:06 UTC]

This has been released in 2.1.2_rc1-r2.