[or-cvs] r12540: Fixed a bug where macchanger gave two or more interfaces the (in incognito/trunk: . arch/x86 portage.config portage.overlay portage.overlay/app-misc portage.overlay/app-misc/livecd-tools portage.overlay/app-misc/livecd-tools/files root_overlay/etc/conf.d root_overlay/etc/init.d root_overlay/usr/sbin root_overlay/var/lib/kdesession)
anonym at seul.org
anonym at seul.org
Mon Nov 19 14:21:00 UTC 2007
Author: anonym
Date: 2007-11-19 09:20:59 -0500 (Mon, 19 Nov 2007)
New Revision: 12540
Added:
incognito/trunk/portage.overlay/app-misc/
incognito/trunk/portage.overlay/app-misc/livecd-tools/
incognito/trunk/portage.overlay/app-misc/livecd-tools/Manifest
incognito/trunk/portage.overlay/app-misc/livecd-tools/files/
incognito/trunk/portage.overlay/app-misc/livecd-tools/files/digest-livecd-tools-1.0.36
incognito/trunk/portage.overlay/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch
incognito/trunk/portage.overlay/app-misc/livecd-tools/livecd-tools-1.0.36.ebuild
incognito/trunk/portage.overlay/app-misc/livecd-tools/metadata.xml
incognito/trunk/root_overlay/etc/conf.d/local.start
incognito/trunk/root_overlay/var/lib/kdesession/krfbrc
Modified:
incognito/trunk/ChangeLog
incognito/trunk/arch/x86/livecd-stage1.spec
incognito/trunk/arch/x86/livecd-stage2-tiny.spec
incognito/trunk/arch/x86/livecd-stage2.spec
incognito/trunk/portage.config/package.keywords
incognito/trunk/root_overlay/etc/conf.d/net
incognito/trunk/root_overlay/etc/init.d/macchanger
incognito/trunk/root_overlay/usr/sbin/create-usb
Log:
Fixed a bug where macchanger gave two or more interfaces the same MAC ending.
Fixed USB copying script so that it works while running from USB.
Fixed KDED Media Manager (i.e. automounting through KDE).
Fixed PCMCIA support.
Disabled network announce of krfb (KDE's desktop sharing service).
The removal of the autoconfig patch some weeks ago apparently broke firmware unpack again. Added livecd-tools-1.0.36 ebuild to fix that.
Cleaned up network config.
Modified: incognito/trunk/ChangeLog
===================================================================
--- incognito/trunk/ChangeLog 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/ChangeLog 2007-11-19 14:20:59 UTC (rev 12540)
@@ -1,4 +1,7 @@
- - Added "dopcmcia" to kernel command line. Seems PCMCIA doesn't work without it.
+ - Fixed a bug where macchanger gave two or more interfaces the same MAC ending.
+ - Fixed USB copying script so that it works while running from USB.
+ - Fixed KDED Media Manager (i.e. automounting through KDE).
+ - Fixed PCMCIA support.
- Pat has resigned from development and passed on maintenance to anonym.
- Firefox 2.0.0.9
Modified: incognito/trunk/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/arch/x86/livecd-stage1.spec 2007-11-19 14:20:59 UTC (rev 12540)
@@ -179,7 +179,6 @@
kde-base/kdialog
kde-base/kviewshell
kde-base/ksystraycmd
- kde-base/kdebase-kioslaves
kde-base/kpager
kde-base/kxkb
kde-base/kdeprint
Modified: incognito/trunk/arch/x86/livecd-stage2-tiny.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2-tiny.spec 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/arch/x86/livecd-stage2-tiny.spec 2007-11-19 14:20:59 UTC (rev 12540)
@@ -32,6 +32,7 @@
acpid|boot
gpm|boot
external-config-setup|boot
+ macchanger|default
hidden-service|default
# See livecd-stage2.spec for why unionfs is buggy
Modified: incognito/trunk/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2.spec 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/arch/x86/livecd-stage2.spec 2007-11-19 14:20:59 UTC (rev 12540)
@@ -51,7 +51,7 @@
boot/kernel/gentoo/config: /usr/src/incognito/arch/x86/kernel-2.6.21.config
-boot/kernel/gentoo/use: pcmcia usb oss atm png jpeg2k
+boot/kernel/gentoo/use: pcmcia usb oss atm png jpeg2k hal
boot/kernel/gentoo/packages:
media-gfx/splashutils
@@ -110,6 +110,7 @@
kde-misc/tcgui
net-misc/networkmanager
kde-misc/knetworkmanager
+ kde-base/kdebase-kioslaves # rebuild with hal
livecd/unmerge:
Modified: incognito/trunk/portage.config/package.keywords
===================================================================
--- incognito/trunk/portage.config/package.keywords 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/portage.config/package.keywords 2007-11-19 14:20:59 UTC (rev 12540)
@@ -54,7 +54,7 @@
x11-plugins/pidgin-otr ~*
dev-util/subversion ~*
sys-boot/syslinux ~*
-=app-misc/livecd-tools-1.0.36 ~*
+app-misc/livecd-tools ~*
# NetworkManager
net-misc/networkmanager ~*
Added: incognito/trunk/portage.overlay/app-misc/livecd-tools/Manifest
===================================================================
--- incognito/trunk/portage.overlay/app-misc/livecd-tools/Manifest (rev 0)
+++ incognito/trunk/portage.overlay/app-misc/livecd-tools/Manifest 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,16 @@
+AUX livecd-tools-1.0.35-umounts.patch 642 RMD160 821a1bca6eebcf00f5f4b55892e744ad23e25751 SHA1 15d529aeb0c6ed5e6d6e570e7ff349be21de6c57 SHA256 0b89df7d00f4e97d91123f266816864bffdb27036849e32639f8bd5bcce8351e
+MD5 409e56a05a768cefbe64923fa61d33e5 files/livecd-tools-1.0.35-umounts.patch 642
+RMD160 821a1bca6eebcf00f5f4b55892e744ad23e25751 files/livecd-tools-1.0.35-umounts.patch 642
+SHA256 0b89df7d00f4e97d91123f266816864bffdb27036849e32639f8bd5bcce8351e files/livecd-tools-1.0.35-umounts.patch 642
+DIST livecd-tools-1.0.36.tar.bz2 9967 RMD160 b5d6045ec0d0b9352f60235f351c822eee64a131 SHA1 0f703e91303d8aeabf09be6d8fc9644de0384c44 SHA256 b26560758acefe46366b9729e7567def03208998f9591f91aebda63cb8b60800
+EBUILD livecd-tools-1.0.36.ebuild 1315 RMD160 2dd10ba220a1fff7a29eeda37562ffc59403e73d SHA1 b4c5222d0d20a186459c6c2a4c6735a4cbb3a7e8 SHA256 a37b66b0ce95279a4d25b4333a2b0ecf15524ddeaff4df7214e30bb69d6c544d
+MD5 53d85e6ca080b1e9c5c203788a704e8c livecd-tools-1.0.36.ebuild 1315
+RMD160 2dd10ba220a1fff7a29eeda37562ffc59403e73d livecd-tools-1.0.36.ebuild 1315
+SHA256 a37b66b0ce95279a4d25b4333a2b0ecf15524ddeaff4df7214e30bb69d6c544d livecd-tools-1.0.36.ebuild 1315
+MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
+MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
+RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
+SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata.xml 159
+MD5 e91677dc56f58e266a773eabfb04eaaf files/digest-livecd-tools-1.0.36 186
+RMD160 719baafe5d49b3b665fa7208b7b02f3904e133ca files/digest-livecd-tools-1.0.36 186
+SHA256 2ef8b981db4533e3ca15a81282d4f84744adf40166708f27ff64ebeb59999031 files/digest-livecd-tools-1.0.36 186
Added: incognito/trunk/portage.overlay/app-misc/livecd-tools/files/digest-livecd-tools-1.0.36
===================================================================
--- incognito/trunk/portage.overlay/app-misc/livecd-tools/files/digest-livecd-tools-1.0.36 (rev 0)
+++ incognito/trunk/portage.overlay/app-misc/livecd-tools/files/digest-livecd-tools-1.0.36 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,2 @@
+RMD160 b5d6045ec0d0b9352f60235f351c822eee64a131 livecd-tools-1.0.36.tar.bz2 9967
+SHA256 b26560758acefe46366b9729e7567def03208998f9591f91aebda63cb8b60800 livecd-tools-1.0.36.tar.bz2 9967
Added: incognito/trunk/portage.overlay/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch
===================================================================
--- incognito/trunk/portage.overlay/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch (rev 0)
+++ incognito/trunk/portage.overlay/app-misc/livecd-tools/files/livecd-tools-1.0.35-umounts.patch 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,20 @@
+Index: livecd-functions.sh
+===================================================================
+--- livecd-functions.sh (revision 126)
++++ livecd-functions.sh (working copy)
+@@ -497,11 +497,13 @@
+ case "${x}" in
+ cdroot)
+ CDBOOT="yes"
+- export CDBOOT
++ RC_NO_UMOUNTS="^(/|/dev|/dev/pts|/lib/rcscripts/init.d|/proc|/proc/.*|/sys|/mnt/livecd|/newroot)$"
++ export CDBOOT RC_NO_UMOUNTS
+ ;;
+ cdroot\=*)
+ CDBOOT="yes"
+- export CDBOOT
++ RC_NO_UMOUNTS="^(/|/dev|/dev/pts|/lib/rcscripts/init.d|/proc|/proc/.*|/sys|/mnt/livecd|/newroot)$"
++ export CDBOOT RC_NO_UMOUNTS
+ ;;
+ console\=*)
+ local live_console
Added: incognito/trunk/portage.overlay/app-misc/livecd-tools/livecd-tools-1.0.36.ebuild
===================================================================
--- incognito/trunk/portage.overlay/app-misc/livecd-tools/livecd-tools-1.0.36.ebuild (rev 0)
+++ incognito/trunk/portage.overlay/app-misc/livecd-tools/livecd-tools-1.0.36.ebuild 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-1.0.36.ebuild,v 1.2 2007/11/01 23:03:37 wolf31o2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="opengl X"
+
+OPENGL_DEPEND="virtual/opengl
+ x11-misc/mkxf86config
+ app-admin/eselect-opengl"
+
+RDEPEND="dev-util/dialog
+ sys-apps/pciutils
+ sys-apps/gawk
+ alpha? ( opengl? ( ${OPENGL_DEPEND} )
+ X? ( >=x11-misc/mkxf86config-0.9.7 ) )
+ amd64? ( opengl? ( ${OPENGL_DEPEND} )
+ X? ( >=x11-misc/mkxf86config-0.9.2 ) )
+ x86? ( opengl? ( ${OPENGL_DEPEND} )
+ X? ( x11-misc/mkxf86config ) )
+ ppc? ( opengl? ( ${OPENGL_DEPEND} )
+ X? ( >=x11-misc/mkxf86config-0.9.7 ) )"
+
+src_install() {
+ doinitd autoconfig
+ newinitd spind.init spind
+ if use x86 || use amd64 || use ppc
+ then
+ if use opengl
+ then
+ dosbin x-setup openglify
+ newinitd x-setup.init x-setup
+ fi
+ fi
+ dosbin net-setup spind
+ into /
+ dobin bashlogin
+ dosbin livecd-functions.sh
+}
Added: incognito/trunk/portage.overlay/app-misc/livecd-tools/metadata.xml
===================================================================
--- incognito/trunk/portage.overlay/app-misc/livecd-tools/metadata.xml (rev 0)
+++ incognito/trunk/portage.overlay/app-misc/livecd-tools/metadata.xml 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>livecd</herd>
+</pkgmetadata>
Added: incognito/trunk/root_overlay/etc/conf.d/local.start
===================================================================
--- incognito/trunk/root_overlay/etc/conf.d/local.start (rev 0)
+++ incognito/trunk/root_overlay/etc/conf.d/local.start 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,3 @@
+# For some reason, "/media" doesn't appear when running the liveCD although it
+# is created by catalyst during build and is present within the image (FIXME).
+[[ ! -e /media ]] && mkdir /media
Modified: incognito/trunk/root_overlay/etc/conf.d/net
===================================================================
--- incognito/trunk/root_overlay/etc/conf.d/net 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/root_overlay/etc/conf.d/net 2007-11-19 14:20:59 UTC (rev 12540)
@@ -4,20 +4,3 @@
modules=( "wpa_supplicant" )
[[ -x /sbin/dhclient ]] && \
modules=( "wpa_supplicant" "dhclient" )
-
-
-# Randomize MAC address, unless using QEMU
-grep macchanger /proc/cmdline >/dev/null
-if [[ $? -eq 0 ]]; then
- #for NIC in $(find /sys/devices -name "carrier" -a -not -path "*/virtual/*" | xargs -r -L 1 dirname | xargs -r -L 1 basename)
- for NIC in eth0 eth1 eth2 eth3 eth4 wlan0 wlan1 ath0 ath1 ra0 ra1
- do
- export mac_${NIC/*:/}="random-ending"
- done
-fi
-
-
-#mac_eth0="random-ending"
-#mac_eth0="random-samekind"
-#mac_eth0="random-anykind"
-#mac_eth0="random-full"
Modified: incognito/trunk/root_overlay/etc/init.d/macchanger
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/macchanger 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/root_overlay/etc/init.d/macchanger 2007-11-19 14:20:59 UTC (rev 12540)
@@ -6,16 +6,21 @@
}
start() {
-
+
+ # A list of NIC:s to randomize (we can assume ethernet only?)
+ #NICS="eth0 eth1 eth2 eth3 eth4 wlan0 wlan1 ath0 ath1 ra00 ra01"
+ NICS="$( ifconfig -a | grep "Link encap:Ethernet" | cut -f 1 -d " " )"
+
# Randomize MAC address
if grep macchanger /proc/cmdline >/dev/null; then
ebegin "Randomizing MAC address(es)"
- #for NIC in $(find /sys/devices -name "carrier" -a -not -path "*/virtual/*" | xargs -r -L 1 dirname | xargs -r -L 1 basename)
- for NIC in eth0 eth1 eth2 eth3 eth4 wlan0 wlan1 ath0 ath1 ra00 ra01
+ for NIC in ${NICS}
do
- macchanger -e ${NIC/*:/} >/dev/null 2>&1
+ macchanger -e ${NIC} > /dev/null 2>&1
+ # macchanger seems to use time as random seed so if we
+ # don't sleep, two NICS might get the same MAC ending
+ sleep 1
done
eend 0
fi
}
-
Modified: incognito/trunk/root_overlay/usr/sbin/create-usb
===================================================================
--- incognito/trunk/root_overlay/usr/sbin/create-usb 2007-11-19 13:20:06 UTC (rev 12539)
+++ incognito/trunk/root_overlay/usr/sbin/create-usb 2007-11-19 14:20:59 UTC (rev 12540)
@@ -103,7 +103,7 @@
# Select USB drive
if [[ -z "${LIST}" ]]; then
- ${DIALOG} --yesno "No usable USB drives detected. The USB drive must have at least one Windows (vfat) partition. Do you want to re-format the drive? Note that this will remove all data from the USB drive so move any valuable data elsewhere before continuing further." 0 ${DEFAULT_WIDTH}
+ ${DIALOG} --yesno "No usable USB drives detected. The USB drive must have at least one Windows (vfat) partition. Do you want to search for USB drives and reformat them instead? Note that this will remove all data from the USB drive so backup any valuable data elsewhere before continuing further." 0 ${DEFAULT_WIDTH}
if [ "$?" == 0 ]; then
format_usb
return
@@ -130,9 +130,19 @@
MEDIAROOT="/mnt/cdrom"
fi
-# Required files
+# determine isolinux/syslinux config directory
+if [[ -d "${MEDIAROOT}/syslinux" ]]; then
+ SYSLINUX="syslinux"
+elif [[ -d "${MEDIAROOT}/isolinux" ]]; then
+ SYSLINUX="isolinux"
+else
+ echo "Could not determine syslinux config directory"
+ exit 1
+fi
+
+# Required files (relative path from cd root)
IMAGE="image.squashfs"
-REQUIRED_FILES="isolinux/isolinux.cfg isolinux/vesamenu.c32 isolinux/splash.png isolinux/gentoo isolinux/gentoo.igz ${IMAGE}"
+REQUIRED_FILES="${SYSLINUX}/isolinux.cfg ${SYSLINUX}/vesamenu.c32 ${SYSLINUX}/splash.png ${SYSLINUX}/gentoo ${SYSLINUX}/gentoo.igz ${IMAGE}"
EXCLUDE="System.map-gentoo|isolinux.bin|boot.cat|kernels.msg"
COPY_FILES=$( find ${MEDIAROOT} ! -type d | egrep -v "$EXCLUDE" | sed "s|${MEDIAROOT}/||g" )
DIRS=$( find ${MEDIAROOT} -type d | egrep -v "$EXCLUDE" | sed "s|${MEDIAROOT}||g" | sed "s|isolinux|syslinux|g" )
Added: incognito/trunk/root_overlay/var/lib/kdesession/krfbrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/krfbrc (rev 0)
+++ incognito/trunk/root_overlay/var/lib/kdesession/krfbrc 2007-11-19 14:20:59 UTC (rev 12540)
@@ -0,0 +1,11 @@
+allowDesktopControl=false
+allowUninvited=false
+confirmUninvitedConnection=true
+disableBackground=false
+disableXShm=false
+enableSLP=false
+preferredPort=-1
+uninvitedPasswordCrypted=
+
+[invitations]
+invitation_num=0
More information about the tor-commits
mailing list