Răsfoiți Sursa

Build improvements and fixes.

Maxim Kammerer 14 ani în urmă
părinte
comite
610bde1bf7
7 a modificat fișierele cu 22 adăugiri și 9 ștergeri
  1. 1 0
      doc/changelog.txt
  2. 2 1
      doc/info.txt
  3. 5 3
      mkroot
  4. 1 0
      src/home/anon/config/mplayer/config
  5. 2 1
      src/root/.bash_profile
  6. 1 1
      src/root/bin/ps-mount
  7. 10 3
      src/root/setup

+ 1 - 0
doc/changelog.txt

@@ -28,6 +28,7 @@
   * Removed the deprecated IDE support in favor of libata, added SMART monitor
   * MAC address is correctly randomized (automatic for Wi-Fi only)
   * Laptop Mode Tools are used for power management
+  * Most capable audio card is configured as default during boot
   * Replaced (unmaintained and Python-based) Wicd with NetworkManager 
 
   * Stability, security, and hardware support improvements

+ 2 - 1
doc/info.txt

@@ -15,7 +15,8 @@ rsync
   [/etc/make.conf]
 
 HKP(S)
-  + hkps://zimmermann.mayfirst.org
+  + https://zimmermann.mayfirst.org/pks/lookup [mkroot]
+  + hkps://zimmermann.mayfirst.org             [anon]
   + [alt: x-hkp://pool.sks-keyservers.net]
   + [alt: x-hkp://keys.gnupg.net]
 

+ 5 - 3
mkroot

@@ -21,7 +21,7 @@ stage3base=${MIRROR}/releases/x86/autobuilds
 portage=${MIRROR}/snapshots/portage-latest.tar.bz2
 
 # Don't rely on the HKP outbounding port being open
-gpg_wwwserver='http://wwwkeys.eu.pgp.net/pks/lookup?op=get&search=0x${fpr}'
+gpg_wwwserver='https://zimmermann.mayfirst.org/pks/lookup?op=get&search=0x${fpr}'
 gpg_keys=`sed '/^#/d; /^$/d; s/ //g' ${FROM}/pubkeys`
 
 mfpl=https://support.mayfirst.org/raw-attachment/wiki/mfpl_certificate_authority/mfpl.crt
@@ -79,7 +79,8 @@ if [ "$2" = fresh  -o  ! -d ${LIVECD}/src ]; then
 
 
     sinfo "Downloading HKPS CA certificate"
-    wget -N -nv -P ${LIVECD}/mirror/keys --no-check-certificate ${mfpl} \
+    wget -N -q  -P ${LIVECD}/mirror/keys --no-check-certificate ${mfpl}
+    wget -N -nv -P ${LIVECD}/mirror/keys --ca-certificate=${LIVECD}/mirror/keys/mfpl.crt \
         ${mfpl}.jamie.asc ${mfpl}.dkg.asc
 
 
@@ -90,7 +91,8 @@ if [ "$2" = fresh  -o  ! -d ${LIVECD}/src ]; then
         keyid=`echo -n ${fpr} | tail -c 8`
 
         if [ ! -e ${LIVECD}/mirror/keys/${org}-${keyid}.asc ]; then
-            eval wget -nv -O ${LIVECD}/mirror/keys/${org}-${keyid}.asc \"${gpg_wwwserver}\"
+            eval wget -nv --ca-certificate=${LIVECD}/mirror/keys/mfpl.crt \
+                -O ${LIVECD}/mirror/keys/${org}-${keyid}.asc \"${gpg_wwwserver}\"
         fi
 
         if type gpg 1>/dev/null 2>&1; then

+ 1 - 0
src/home/anon/config/mplayer/config

@@ -8,6 +8,7 @@ font="Sans"
 
 af-add=bs2b
 vf-add=screenshot
+zoom=yes
 
 tv=driver=v4l2
 

+ 2 - 1
src/root/.bash_profile

@@ -1,7 +1,8 @@
 umask 022
 
 if type -p env-update 1>/dev/null; then
-	env-update && source /etc/profile
+    env-update
+    source /etc/profile
 
     # see /root/.cpan/CPAN/MyConfig.pm (currently unused)
     # export PERL5LIB=/var/tmp/cpan/lib

+ 1 - 1
src/root/bin/ps-mount

@@ -247,5 +247,5 @@ else
     fi
 
     # Bash doesn't understand ${lockfd}<
-    (flock ${lockfd} && "$0" fork "$@") 20< ${lock} &
+    (flock ${lockfd}; "$0" fork "$@") 20< ${lock} &
 fi

+ 10 - 3
src/root/setup

@@ -115,7 +115,8 @@ if [ "$1" = fresh  -o  ! -d /usr/src/linux-${kversion} ]; then
             emerge -qC --deselect=n =sys-devel/`basename ${oldgcc}`
         fi
     fi
-    env-update && source /etc/profile
+    env-update
+    source /etc/profile
 
     emerge -q1 virtual/libc
     rm -f ${protected}
@@ -322,7 +323,12 @@ rm -f  /var/log/wtmp
 sinfo "Setting up users"
 sed -i 's/^#\?\(ENCRYPT_METHOD\) .*/\1 SHA256/' /etc/login.defs
 
-grpck -r && grpconv
+pwconv
+pwck -qr
+
+groupdel smmsp || [ $? = 6 ]
+grpck -r
+grpconv
 
 echo root:liberte | chpasswd
 
@@ -350,7 +356,8 @@ sudo -n -u anon chmod 600 /home/anon/persist/security/pgp/mfpl.crt
 
 
 sinfo "Installing wrappers"
-mv -n /sbin/iwconfig{,.orig} && ln -sf iwconfig.wrapper /sbin/iwconfig
+mv -n /sbin/iwconfig{,.orig}
+ln -sf iwconfig.wrapper /sbin/iwconfig
 
 
 sinfo "Compiling kernel"