baselayout2-merge

baselayout2-merge.txt (text/plain), 6.71 KB, created by Matthias Schwarzott on 2009-02-23 18:32:42 UTC

* checking 22 files for package collisions
--- /etc/
--- /etc/env.d/
>>> /etc/env.d/00basic
>>> /etc/hosts
>>> /etc/issue
>>> /etc/._cfg0000_gentoo-release
>>> /etc/filesystems
>>> /etc/issue.logo
--- /etc/modprobe.d/
>>> /etc/modprobe.d/i386
>>> /etc/modprobe.d/aliases
>>> /etc/._cfg0000_sysctl.conf
>>> /etc/shells
>>> /etc/._cfg0000_networks
>>> /etc/services
>>> /etc/inputrc
>>> /etc/._cfg0000_protocols
>>> /etc/._cfg0000_profile
--- /usr/
--- /usr/share/
--- /usr/share/doc/
>>> /usr/share/doc/baselayout-2.0.0/
>>> /usr/share/doc/baselayout-2.0.0/ChangeLog.bz2
--- /usr/share/baselayout/
>>> /usr/share/baselayout/fstab
>>> /usr/share/baselayout/group
>>> /usr/share/baselayout/passwd
>>> /usr/share/baselayout/shadow
>>> /usr/share/baselayout/issue.devfix
>>> Safely unmerging already-installed instance...
No package files given... Grabbing a set.
<<<          obj /usr/share/man/man8/start-stop-daemon.8.bz2
<<<          obj /usr/share/man/man8/rc-update.8.bz2
<<<          obj /usr/share/man/man8/rc-status.8.bz2
<<<          obj /usr/share/man/man8/MAKEDEV.8.bz2
<<<          obj /usr/share/man/man5/modules.autoload.5.bz2
<<<          obj /usr/share/man/man1/consoletype.1.bz2
<<<          obj /usr/share/doc/baselayout-1.12.11.1/ChangeLog.bz2
--- replaced dir /usr/share/doc
--- replaced obj /usr/share/baselayout/shadow
<<<          obj /usr/share/baselayout/rc-lists/single
<<<          obj /usr/share/baselayout/rc-lists/nonetwork
<<<          obj /usr/share/baselayout/rc-lists/default
<<<          obj /usr/share/baselayout/rc-lists/boot
--- replaced obj /usr/share/baselayout/passwd
<<<          obj /usr/share/baselayout/mklinks.sh
<<<          obj /usr/share/baselayout/mkdirs.sh
--- replaced obj /usr/share/baselayout/issue.devfix
<<<          obj /usr/share/baselayout/hosts
--- replaced obj /usr/share/baselayout/group
--- replaced obj /usr/share/baselayout/fstab
--- replaced dir /usr/share/baselayout
--- replaced dir /usr/share
<<<          sym /usr/sbin/MAKEDEV
--- replaced dir /usr
<<<          sym /sbin/update-rc
<<<          obj /sbin/start-stop-daemon
<<<          obj /sbin/runscript.sh
<<<          obj /sbin/runscript
<<<          obj /sbin/rc-update
<<<          obj /sbin/rc
<<<          obj /sbin/functions.sh
<<<          obj /sbin/env-update.sh
<<<          obj /sbin/depscan.sh
<<<          obj /sbin/consoletype
<<<          obj /sbin/MAKEDEV
<<<          obj /lib/rcscripts/sh/rc-services.sh
<<<          obj /lib/rcscripts/sh/rc-help.sh
<<<          obj /lib/rcscripts/sh/rc-daemon.sh
<<<          obj /lib/rcscripts/net/wpa_supplicant.sh
<<<          obj /lib/rcscripts/net/vlan.sh
<<<          obj /lib/rcscripts/net/udhcpc.sh
<<<          obj /lib/rcscripts/net/tuntap.sh
<<<          obj /lib/rcscripts/net/system.sh
<<<          obj /lib/rcscripts/net/rename.sh
<<<          obj /lib/rcscripts/net/pump.sh
<<<          obj /lib/rcscripts/net/pppd.sh
<<<          obj /lib/rcscripts/net/netplugd.sh
<<<          obj /lib/rcscripts/net/macnet.sh
<<<          obj /lib/rcscripts/net/macchanger.sh
<<<          obj /lib/rcscripts/net/iwconfig.sh
<<<          obj /lib/rcscripts/net/iptunnel.sh
<<<          obj /lib/rcscripts/net/iproute2.sh
<<<          obj /lib/rcscripts/net/ipppd.sh
<<<          obj /lib/rcscripts/net/ip6to4.sh
<<<          obj /lib/rcscripts/net/ifplugd.sh
<<<          obj /lib/rcscripts/net/ifconfig.sh
<<<          obj /lib/rcscripts/net/essidnet.sh
<<<          obj /lib/rcscripts/net/dhcpcd.sh
<<<          obj /lib/rcscripts/net/dhclient.sh
<<<          obj /lib/rcscripts/net/clip.sh
<<<          obj /lib/rcscripts/net/ccwgroup.sh
<<<          obj /lib/rcscripts/net/bridge.sh
<<<          obj /lib/rcscripts/net/br2684ctl.sh
<<<          obj /lib/rcscripts/net/bonding.sh
<<<          obj /lib/rcscripts/net/arping.sh
<<<          obj /lib/rcscripts/net/apipa.sh
<<<          obj /lib/rcscripts/net/adsl.sh
<<<          obj /lib/rcscripts/conf.d/env_whitelist
<<<          obj /lib/rcscripts/awk/genenviron.awk
<<<          obj /lib/rcscripts/awk/gendepends.awk
<<<          obj /lib/rcscripts/awk/functions.awk
<<<          obj /lib/rcscripts/awk/cachedepends.awk
--- replaced obj /etc/sysctl.conf
--- replaced obj /etc/shells
--- replaced obj /etc/services
<<<          obj /etc/rc.conf
--- replaced obj /etc/protocols
--- replaced obj /etc/profile
--- replaced obj /etc/networks
<<<          obj /etc/modules.d/i386
<<<          obj /etc/modules.d/aliases
<<<          obj /etc/modules.autoload.d/kernel-2.6
<<<          obj /etc/modules.autoload.d/kernel-2.4
--- replaced obj /etc/issue.logo
--- replaced obj /etc/issue
--- replaced obj /etc/inputrc
<<<          obj /etc/init.d/urandom
--- !mtime   sym /etc/init.d/runscript.sh
<<<          obj /etc/init.d/rmnologin
<<<          obj /etc/init.d/numlock
<<<          obj /etc/init.d/netmount
<<<          obj /etc/init.d/net.lo
--- !mtime   sym /etc/init.d/net.eth0
<<<          obj /etc/init.d/modules
<<<          obj /etc/init.d/localmount
<<<          obj /etc/init.d/local
<<<          obj /etc/init.d/keymaps
<<<          obj /etc/init.d/hostname
<<<          obj /etc/init.d/halt.sh
--- !mtime   sym /etc/init.d/functions.sh
--- !mtime   sym /etc/init.d/depscan.sh
<<<          obj /etc/init.d/consolefont
<<<          obj /etc/init.d/clock
<<<          obj /etc/init.d/checkroot
<<<          obj /etc/init.d/checkfs
<<<          obj /etc/init.d/bootmisc
--- replaced obj /etc/gentoo-release
--- replaced obj /etc/filesystems
--- replaced obj /etc/env.d/00basic
--- replaced dir /etc/env.d
--- !mtime   obj /etc/conf.d/wireless.example
--- !mtime   obj /etc/conf.d/urandom
--- !mtime   obj /etc/conf.d/rc
--- !mtime   obj /etc/conf.d/net.example
--- !mtime   obj /etc/conf.d/net
--- !mtime   obj /etc/conf.d/local.stop
--- !mtime   obj /etc/conf.d/local.start
--- !mtime   obj /etc/conf.d/keymaps
--- !mtime   obj /etc/conf.d/hostname
--- !mtime   obj /etc/conf.d/env_whitelist
--- !mtime   obj /etc/conf.d/consolefont
--- !mtime   obj /etc/conf.d/clock
--- !mtime   obj /etc/conf.d/bootmisc
--- replaced dir /etc
<<<          sym /dev/MAKEDEV
<<<          obj /bin/rc-status
<<<          obj /bin/checkpath
--- !empty   dir /usr/share/man/man8
--- !empty   dir /usr/share/man/man5
--- !empty   dir /usr/share/man/man1
--- !empty   dir /usr/share/man
<<<          dir /usr/share/doc/baselayout-1.12.11.1
<<<          dir /usr/share/baselayout/rc-lists
--- !empty   dir /usr/sbin
--- !empty   dir /sbin
--- !empty   dir /lib/rcscripts/sh
--- !empty   dir /lib/rcscripts/net
<<<          dir /lib/rcscripts/conf.d
--- !empty   dir /lib/rcscripts/awk
--- !empty   dir /lib/rcscripts
--- !empty   dir /lib
--- !empty   dir /etc/modules.d
--- !empty   dir /etc/modules.autoload.d
--- !empty   dir /etc/init.d
--- !empty   dir /etc/conf.d
--- !empty   dir /dev
--- !empty   dir /bin
>>> Original instance of package unmerged safely.