diff options
Diffstat (limited to 'unofficial')
| -rw-r--r-- | unofficial/HOWTO | 9 | ||||
| -rw-r--r-- | unofficial/modules/TODO | 3 | ||||
| -rw-r--r-- | unofficial/modules/dieter/libs/lib-deployment.sh | 21 | ||||
| -rw-r--r-- | unofficial/modules/dieter/procedures/automatic | 152 | ||||
| -rw-r--r-- | unofficial/modules/dieter/whatsthis.txt | 2 | ||||
| -rw-r--r-- | unofficial/modules/yaourt/libs/lib-yaourt-sh | 23 | ||||
| -rw-r--r-- | unofficial/modules/yaourt/whatsthis.txt | 4 | ||||
| -rw-r--r-- | unofficial/whatsthis.txt | 5 |
8 files changed, 0 insertions, 219 deletions
diff --git a/unofficial/HOWTO b/unofficial/HOWTO deleted file mode 100644 index 4dc6384..0000000 --- a/unofficial/HOWTO +++ /dev/null @@ -1,9 +0,0 @@ -# to install these unofficial modules onto the arch install cd: - - - -# install aif from package - -git clone git://github.com/Dieterbe/aif.git /home/arch/tmp - -cp -ax /home/arch/tmp/unofficial/modules/* /home/arch/aif/user/ diff --git a/unofficial/modules/TODO b/unofficial/modules/TODO deleted file mode 100644 index 3f19b66..0000000 --- a/unofficial/modules/TODO +++ /dev/null @@ -1,3 +0,0 @@ -See also the FIXME's and TODO's in the code. -* dieter/automatic: wait for yaourt --config fix ( http://forums.archlinux.fr/post23171.html#23171 ) -* dieter/automatic: put config files from svn in place first, so that if a package has an update, it can do it's thing. diff --git a/unofficial/modules/dieter/libs/lib-deployment.sh b/unofficial/modules/dieter/libs/lib-deployment.sh deleted file mode 100644 index da63f3f..0000000 --- a/unofficial/modules/dieter/libs/lib-deployment.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -_accept_ssl_cert () -{ - mkdir -p /root/.subversion/auth/svn.ssl.server - cat > /root/.subversion/auth/svn.ssl.server/1123d3c8b27895efee3848cc779e526a << EOF -K 10 -ascii_cert -V 716 -MIICFTCCAX6gAwIBAgIBAjANBgkqhkiG9w0BAQQFADBVMRswGQYDVQQKExJBcGFjaGUgSFRUUCBTZXJ2ZXIxIjAgBgNVBAsTGUZvciB0ZXN0aW5nIHB1cnBvc2VzIG9ubHkxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0wNjA3MjQxMjUwMzdaFw0wNzA3MjQxMjUwMzdaMEwxGzAZBgNVBAoTEkFwYWNoZSBIVFRQIFNlcnZlcjEZMBcGA1UECxMQVGVzdCBDZXJ0aWZpY2F0ZTESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF5PB1NnUve2jkisDTGsxKC9qzpnl+eX8UIR/1s+yX2ZIPNnIryeqTc6sS3cBHz2/AufIr0xbpXkTa4V5Es5bXA7W1D7+ZzuFHjjyi4E2eqYVkhkv1sRL5TpAovfjAA+96iaFHp3yKYiuw/nWwQTSW9M1VrDEym4ODxyJOtNdgQQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABY0bnBf9tL1WMC1sLxB1eDXvs5qNY96mny+EKGAbyQROPaXwsRQB0HrAkuWfHzQlgIdD6AfGsd+YMcEuqSPzIz6t6mA45jl++WvI6we9t3eYChtdPD2xjgHti0aSiDyVLTJbXPnkdgzKvIjYZcXBwbmbQSrg0STO5m+cSYt3chx -K 8 -failures -V 2 -14 -K 15 -svn:realmstring -V 23 -https://192.168.1.2:443 -END -EOF -} diff --git a/unofficial/modules/dieter/procedures/automatic b/unofficial/modules/dieter/procedures/automatic deleted file mode 100644 index 3907fa2..0000000 --- a/unofficial/modules/dieter/procedures/automatic +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/bash -depend_module yaourt -depend_procedure core base - -var_RUNTIME_PACKAGES="svn" - -phase_preparation=(\ - configure \ - intro \ - sysprep \ - msg_manual \ - runtime_network \ - runtime_svn \ - msg_automatic \ - select_source \ - runtime_packages \ - runtime_yaourt) - -phase_finish=(configure_home msg_report) - - -worker_intro () -{ - notify "Dieter::automatic procedure running..." -} - - -worker_configure () -{ - var_UI_TYPE=${arg_ui_type:-cli} -} - - -worker_msg_manual () -{ - # All things that need to be done manually first - notify "A few manual things need to happen first..." -} - - -worker_msg_automatic () -{ - notify "**** From now on. everything will be automatic. Enjoy the show!" # not true: you need pass for dm_crypt -} - - -worker_runtime_network () -{ - if ask_yesno "Do you want to (re)-configure your networking?" - then - #TODO: which function do i need here? - donetwork #configure network by using library - else - notify "Ok. skipping network config" - fi -} - - -worker_runtime_svn () -{ - SVN_USERNAME=dieter - ask_password svn #TODO: if user entered incorrect password, the install process will just fail.. - SVN="svn --username $SVN_USERNAME --password $SVN_PASSWORD" - SVN_BASE=https://192.168.1.2/svn/repos - TARGET_HOST=desktop-a7n8x #TODO: prompt user for this, or let him pass it as cmdline argument (and check with svn info) - _accept_ssl_cert -} - - -worker_prepare_disks () -{ - modprobe dm-crypt || die_error "Cannot modprobe dm-crypt" - modprobe -q aes-x86-64 || modprobe aes-i586 || die_error "Cannot modprobe aes-x86-64 or aes-i586" - - # Cleanup whatever state the disk is in (that includes previous, failed runs of this script) - umount /dev/mapper/cryptpool-* 2>/dev/null - vgremove -f cryptpool 2>/dev/null - pvremove /dev/mapper/sda2_crypt 2>/dev/null - cryptsetup luksClose sda2_crypt 2>/dev/null - dd if=/dev/urandom of=/dev/sda bs=512 count=1 - - #TODO: integrate this stuff into the functions in the libs (process_partitions and filesystems, rollback and bailout if needed) + do error checking and handling - #NOTE: i don't think i should quote to prevent globbing, but it does seem to help i think (hard to check as resource is busy and you can't reload kernel partition tables) - sfdisk /dev/sda 2>&1 | grep -v 'not have an msdos signature' << EOF -,10,L,'*' -,,L -EOF - [ $? -gt 0 ] && die_error "Could not sfdisk /dev/sda. Return code is $?" - #TODO: when sfdisk is done, i still have an invalid partition table? - cryptsetup --batch-mode -c aes-xts-plain -y -s 512 luksFormat /dev/sda2 || die_error "Cannot cryptsetup luksFormat /dev/sda2" - cryptsetup luksOpen /dev/sda2 sda2_crypt || die_error "Cannot cryptsetup luksOpen /dev/sda2" - pvcreate /dev/mapper/sda2_crypt || die_error "Cannot pvcreate the PV on the encrypted blockdevice" - vgcreate cryptpool /dev/mapper/sda2_crypt || die_error "Cannot create the VG an the PV on the encrypted blockdevice" - lvcreate -L 2G -n swap cryptpool && \ - lvcreate -L 500M -n tmp cryptpool && \ - lvcreate -L 10G -n home cryptpool && \ - lvcreate -L 10G -n root cryptpool && \ - lvcreate -L 3G -n var cryptpool || die_error "Could not create at least one of the LV's" - for i in home root tmp var - do - mkdir -p $var_TARGET_DIR/$i - mke2fs -j /dev/cryptpool/$i && mount /dev/cryptpool/$i $var_TARGET_DIR/$i || die_error "Could not format or mount $var_TARGET_DIR/$i" - done - - # TODO: swapon the thing and don't forget to swapoff it in the cleanup part above - # TODO: fstab? auto-add to fstab with libs? auto mkdir's on target_dir? - true -} - -worker_package_list () -{ - $SVN export $SVN_BASE/ddm-configs/$TARGET_HOST/trunk/package-list $var_PKG_FILE || die_error "Could not export package list!" - # cat -> there are newlines in it -> var=`echo $var` -> not anymore :) - TARGET_PACKAGES=`cat $var_PKG_FILE` && TARGET_PACKAGES=`echo $TARGET_PACKAGES` || die_error "Could not cat package list. THIS SHOULD NEVER HAPPEN." - true -} - - -worker_install_packages () -{ - target_prepare_pacman core extra community #TODO: it would be better if this was a separate worker, i think - [ -z "$TARGET_PACKAGES" ] && die_error "No packages listed to be installed!" - installpkg -} - - -worker_configure_home () -{ - #checkout from svn - true -} - - -worker_set_clock () -{ - #timezone="Europe/Brussels" - #Not doing anything. hwclock is set already and configs are coming from svn anyway.. - true -} - - -worker_install_bootloader () -{ - install-grub /dev/sda -} - - -worker_runtime_yaourt () -{ - _yaourt_replace_pacman -} - diff --git a/unofficial/modules/dieter/whatsthis.txt b/unofficial/modules/dieter/whatsthis.txt deleted file mode 100644 index 5c55ca8..0000000 --- a/unofficial/modules/dieter/whatsthis.txt +++ /dev/null @@ -1,2 +0,0 @@ -module with stuff for my (Dieter) own environment. Customized for my needs -(my data and settings are in svn/ddm repositories)
\ No newline at end of file diff --git a/unofficial/modules/yaourt/libs/lib-yaourt-sh b/unofficial/modules/yaourt/libs/lib-yaourt-sh deleted file mode 100644 index fd9c4d0..0000000 --- a/unofficial/modules/yaourt/libs/lib-yaourt-sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# See http://wiki.archlinux.org/index.php/Yaourt - -_runtime_yaourt () -{ - if ! list_pacman_repos runtime | grep -q archlinuxfr - then - add_pacman_repo runtime archlinuxfr 'Server = http://repo.archlinux.fr/i686' - fi - $PACMAN -Sy yaourt || die_error "_runtime_yaourt Cannot install yaourt" - YAOURT=`sed 's/pacman/yaourt/' <<< $PACMAN` - YAOURT_TARGET=`sed 's/pacman/yaourt/' <<< $PACMAN_TARGET` -} - - -_yaourt_replace_pacman () -{ - _runtime_yaourt - PACMAN=$YAOURT - PACMAN_TARGET=$YAOURT_TARGET -} - diff --git a/unofficial/modules/yaourt/whatsthis.txt b/unofficial/modules/yaourt/whatsthis.txt deleted file mode 100644 index 66a393f..0000000 --- a/unofficial/modules/yaourt/whatsthis.txt +++ /dev/null @@ -1,4 +0,0 @@ -I plan to someday write a module that will make yaourt available during -installation, so you can imediately install packages from AUR on your system -during installation. This is something that does not belong in core, it's -for power users only ;-) diff --git a/unofficial/whatsthis.txt b/unofficial/whatsthis.txt deleted file mode 100644 index a3bfa0d..0000000 --- a/unofficial/whatsthis.txt +++ /dev/null @@ -1,5 +0,0 @@ -This directory contains unofficial additions (modules) to/for AIF that I (Dieter) -am writing. - -They are _not_ intended to be part of the "official" aif. it's just in the same repo for -my own convenience.
\ No newline at end of file |