From abbc0fe09aabfd8f066f45ac62b218e6672f930c Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 22 Feb 2013 20:19:43 +0100 Subject: [PATCH] Correction : install -u -> install -o . --- vm_hosted | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/vm_hosted b/vm_hosted index 46ae2ce..3f5c747 100755 --- a/vm_hosted +++ b/vm_hosted @@ -58,13 +58,13 @@ rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ? } rule_apt_configure () { - sudo install -m 660 -u root -g root /dev/stdin /etc/apt/sources.list <<-EOF + sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF deb http://ftp.fr.debian.org/debian $vm_lsb_name main contrib non-free EOF - sudo install -m 660 -u root -g root /dev/stdin /etc/apt/$vm_lsb_name-backports.list <<-EOF + sudo install -m 660 -o root -g root /dev/stdin /etc/apt/$vm_lsb_name-backports.list <<-EOF #deb http://backports.debian.org/debian-backports $vm_lsb_name-backports main contrib non-free EOF - sudo install -m 660 -u root -g root /dev/stdin /etc/apt/preferences <<-EOF + sudo install -m 660 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF Package: * Pin: release a=$vm_lsb_name Pin-Priority: 170 @@ -73,12 +73,12 @@ rule_apt_configure () { Pin: release a=$vm_lsb_name-backports Pin-Priority: 200 EOF - sudo install -m 660 -u root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF + sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF deb http://nightly.openerp.com/trunk/nightly/deb/ ./ EOF sudo apt-get update rule apt_get_install apticron - sudo install -m 644 -u root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/apticron/apticron.conf <<-EOF EMAIL="admin@$vm_domainname" # DIFF_ONLY="1" # LISTCHANGES_PROFILE="apticron" @@ -97,9 +97,9 @@ rule_apt_configure () { rule_boot_configure () { warn "lors de l'installation Debian, surtout n'installer GRUB sur AUCUN disque proposé !" rule apt_get_install grub-pc - sudo install -d -m 644 -u root -g root /boot/grub + sudo install -d -m 644 -o root -g root /boot/grub rule apt_get_install linux-image-$vm_arch - sudo install -m 644 -u root -g root /dev/stdin /etc/default/grub <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/default/grub <<-EOF GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR=\`lsb_release -i -s 2> /dev/null || echo Debian\` @@ -108,7 +108,7 @@ rule_boot_configure () { GRUB_DISABLE_RECOVERY="true" #GRUB_PRELOAD_MODULES="lvm" EOF - sudo install -m 644 -u root -g root /dev/stdin /boot/grub/device.map <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /boot/grub/device.map <<-EOF (hd0) /dev/xvda (hd0) /dev/mapper/domU-$(printf %s $vm_fqdn-disk | sed -e 's/-/--/g') EOF @@ -197,7 +197,7 @@ rule_dovecot_configure () { sudo service dovecot restart } rule_etckeeper_configure () { - sudo install -m 644 -u root -g root /dev/stdin /etc/etckeeper/etckeeper.conf <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/etckeeper/etckeeper.conf <<-EOF VCS=git GIT_COMMIT_OPTIONS="" AVOID_DAILY_AUTOCOMMITS=1 @@ -212,7 +212,7 @@ rule_etckeeper_configure () { rule apt_get_install etckeeper } rule_filesystem_configure () { - sudo install -m 644 -u root -g root /dev/stdin /etc/fstab <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/fstab <<-EOF # LABEL=${vm_lvm_lv}_boot /boot ext2 defaults 0 0 proc /proc proc defaults 0 0 @@ -224,31 +224,31 @@ rule_filesystem_configure () { # NOTE: barrier=1 réduit drastiquement les performances d'écriture, mais garantit la cohérence du système de fichiers. /dev/mapper/${vm_lvm_lv}_swap_deciphered swap swap sw 0 0 EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/crypttab <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/crypttab <<-EOF # ${vm_lvm_lv}_root_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_root none luks,lvm=$vm_lvm_vg ${vm_lvm_lv}_var_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_var ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived ${vm_lvm_lv}_home_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_home ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived ${vm_lvm_lv}_swap_deciphered /dev/$vm_lvm_vg/${vm_lvm_lv}_swap ${vm_lvm_lv}_root_deciphered luks,lvm=$vm_lvm_vg,keyscript=/lib/cryptsetup/scripts/decrypt_derived EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/sysctl.d/local-swap.conf <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/sysctl.d/local-swap.conf <<-EOF vm.swappiness = 10 # NOTE: n'utilise le swap qu'en cas d'absolue nécessité vm.vfs_cache_pressure=50 EOF } rule_initramfs_configure () { - sudo install -m 644 -u root -g root /dev/stdin /etc/initramfs-tools/initramfs.conf <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/initramfs.conf <<-EOF MODULES=most BUSYBOX=y KEYMAP=y COMPRESS=gzip DEVICE=eth0 EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/modprobe.d/xen-pv.conf <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/modprobe.d/xen-pv.conf <<-EOF alias eth0 xennet alias scsi_hostadapter xenblk EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/modules <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/modules <<-EOF sha1_generic sha256_generic sha512_generic @@ -257,7 +257,7 @@ rule_initramfs_configure () { # NOTE: pour Xen en mode HVM : #modprobe xen-platform-pci EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/initramfs-tools/modules <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/modules <<-EOF EOF sudo sed -e '/^configure_networking /s/ &$//' \ -i /usr/share/initramfs-tools/scripts/init-premount/dropbear @@ -274,7 +274,7 @@ rule_initramfs_configure () { /etc/initramfs-tools/etc/dropbear/dropbear_rsa_host_key } # NOTE: ne se préoccupe pas de dropbear_dss_host_key ; Debian la génère et l'utilise néamoins. - sudo install -d -m 640 -u root -g root \ + sudo install -d -m 640 -o root -g root \ /etc/initramfs-tools/root \ /etc/initramfs-tools/root/.ssh getent group sudo | @@ -286,7 +286,7 @@ rule_initramfs_configure () { cat "$home"/etc/ssh/authorized_keys done done | - sudo install -m 644 -u root -g root /dev/stdin /etc/initramfs-tools/root/.ssh/authorized_keys + sudo install -m 644 -o root -g root /dev/stdin /etc/initramfs-tools/root/.ssh/authorized_keys sudo rm -f \ /etc/initramfs-tools/root/.ssh/id_rsa.dropbear \ /etc/initramfs-tools/root/.ssh/id_rsa.pub \ @@ -295,23 +295,23 @@ rule_initramfs_configure () { sudo update-initramfs -u } rule_locale_configure () { - sudo install -m 644 -u root -g root /dev/stdin /etc/locale.gen <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/locale.gen <<-EOF fr_FR.UTF-8 UTF-8 EOF sudo update-locale } rule_login_configure () { grep -q '^hvc0$' /etc/securetty || - sudo install -m 644 -u root -g root /dev/stdin /etc/securetty <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/securetty <<-EOF $(cat /etc/securetty) hvc0 EOF grep -q '^xvc0$' /etc/securetty || - sudo install -m 644 -u root -g root /dev/stdin /etc/securetty <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/securetty <<-EOF $(cat /etc/securetty) xvc0 EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/inittab <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/inittab <<-EOF # /etc/inittab: init(8) configuration. # The default runlevel. @@ -354,7 +354,7 @@ rule_login_configure () { hvc:2345:respawn:/sbin/getty 38400 hvc0 #xvc:2345:respawn:/sbin/getty 38400 xvc0 EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/login.defs <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/login.defs <<-EOF MAIL_DIR /var/mail FAILLOG_ENAB yes LOG_UNKFAIL_ENAB no @@ -392,7 +392,7 @@ rule_login_configure () { ENCRYPT_METHOD SHA512 EOF grep -q '^session optional pam_umask.so\>' /etc/pam.d/common-session || - sudo install -m 644 -u root -g root /dev/stdin /etc/pam.d/common-session <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/pam.d/common-session <<-EOF $(cat /etc/pam.d/common-session) session optional pam_umask.so EOF @@ -503,15 +503,15 @@ rule_mail_configure () { rule dovecot_configure } rule_network_configure () { - sudo install -m 644 -u root -g root /dev/stdin /etc/hostname <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/hostname <<-EOF $vm EOF grep -q " $vm\$" /etc/hosts || - sudo install -m 644 -u root -g root /dev/stdin /etc/hosts <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/hosts <<-EOF $(cat /etc/hosts) 127.0.0.1 $vm_fqdn $vm EOF - sudo install -m 644 -u root -g root /dev/stdin /etc/network/interfaces <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/network/interfaces <<-EOF auto lo iface lo inet loopback @@ -555,7 +555,7 @@ rule_ssh_configure () { /etc/ssh/ssh_host_ecdsa_key \ /etc/ssh/ssh_host_ecdsa_key.pub # NOTE: clefs générées par Debian - sudo install -m 644 -u root -g root /dev/stdin /etc/ssh/sshd_config <<-EOF + sudo install -m 644 -o root -g root /dev/stdin /etc/ssh/sshd_config <<-EOF Port 22 ListenAddress $vm_ipv4 #ListenAddress :: @@ -632,10 +632,10 @@ rule_user_configure () { case \$(/usr/bin/passwd --status "\$SUDO_USER") in \\ ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac EOF - sudo install -m 640 -u root -g root /dev/stdin /etc/sudoers.d/etckeeper-unclean <<-EOF + sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/etckeeper-unclean <<-EOF %sudo ALL=(ALL) NOPASSWD: /usr/sbin/etckeeper unclean EOF - sudo install -m 640 -u root -g root /dev/stdin /etc/sudoers.d/env_keep <<-EOF + sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/env_keep <<-EOF Defaults env_keep = " \\ EDITOR \\ GIT_AUTHOR_NAME \\ @@ -650,7 +650,7 @@ rule_user_configure () { sudo /bin/sh -e -f -u -c \ 'case \$(/usr/bin/passwd --status "\$SUDO_USER") in ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac' EOF - sudo install -m 644 -u root -g root \ + sudo install -m 644 -o root -g root \ etc/bash.bashrc \ /etc/bash.bashrc sudo install -m 644 -o root -g root \ @@ -658,7 +658,7 @@ rule_user_configure () { /etc/screenrc } rule_user_root_configure () { - sudo install -d -m 750 -u root -g adm \ + sudo install -d -m 750 -o root -g adm \ /root/etc \ /root/etc/ssh \ /root/etc/gpg @@ -673,7 +673,7 @@ rule_user_root_configure () { cat "$home"/etc/ssh/authorized_keys done done | - sudo install -m 640 -u root -g root /dev/stdin /root/etc/ssh/authorized_keys + sudo install -m 640 -o root -g root /dev/stdin /root/etc/ssh/authorized_keys local key; local -; set +f for key in "$tool"/var/pub/openpgp/*.key do sudo gpg --import "$key" -- 2.20.1