sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[scripts] uniform ". /etc/profile" usage

Browse Source
This commit is contained in:
Fabio Erculiani 2012-09-16 20:12:27 +02:00
parent 9026228337
commit 96b9416504
9 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/amazon_ebs_image_inner_chroot_script.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
# make sure there is no stale pid file around that prevents entropy from running # make sure there is no stale pid file around that prevents entropy from running
rm -f /var/run/entropy/entropy.lock rm -f /var/run/entropy/entropy.lock

6
scripts/amazon_ebs_image_inner_chroot_script_after.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
echo echo
echo "Configuring AMI root filesystem" echo "Configuring AMI root filesystem"
echo "Ext4 is the expected filesystem type" echo "Ext4 is the expected filesystem type"
@ -7,9 +10,6 @@ echo "/dev/sda1 is the expected root filesystem partition"
echo "ec2-user is the expected user" echo "ec2-user is the expected user"
echo echo
/usr/sbin/env-update
. /etc/profile
# setup networking, make sure networkmanager is gone # setup networking, make sure networkmanager is gone
rc-update del NetworkManager boot rc-update del NetworkManager boot
rc-update del NetworkManager default rc-update del NetworkManager default

3
scripts/amd64_x86_inner_chroot_script_after.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
# Setup Desktop links # Setup Desktop links
# ARM Images links # ARM Images links
ln -s "/mnt/cdrom/ARM" "/etc/skel/Desktop/ARM_Images" ln -s "/mnt/cdrom/ARM" "/etc/skel/Desktop/ARM_Images"

6
scripts/image_generic_inner_chroot_script_after.sh
View File

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
echo echo
echo "Configuring AMI chroot" echo "Configuring AMI chroot"
echo echo
/usr/sbin/env-update
. /etc/profile
# setup networking, make sure networkmanager is gone # setup networking, make sure networkmanager is gone
rc-update del networkmanager default &> /dev/null rc-update del networkmanager default &> /dev/null
# add eth0, should get dhcp by default already # add eth0, should get dhcp by default already

6
scripts/inner_chroot_script.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
/usr/sbin/env-update
. /etc/profile
# create /proc if it doesn't exist # create /proc if it doesn't exist
# rsync doesn't copy it # rsync doesn't copy it
if [ ! -d "/proc" ]; then if [ ! -d "/proc" ]; then
@ -19,9 +22,6 @@ rm -rf /root
cp /etc/skel /root -Rap cp /etc/skel /root -Rap
chown root:root /root -R chown root:root /root -R
/usr/sbin/env-update
. /etc/profile
# Setup locale to en_US # Setup locale to en_US
echo LANG=\"en_US.UTF-8\" > /etc/env.d/02locale echo LANG=\"en_US.UTF-8\" > /etc/env.d/02locale
echo LANGUAGE=\"en_US.UTF-8\" >> /etc/env.d/02locale echo LANGUAGE=\"en_US.UTF-8\" >> /etc/env.d/02locale

3
scripts/remaster_gaming_inner_chroot_script_after.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
# FUTURE NOTE: # FUTURE NOTE:
# this might get merged into remaster_generic_inner_chroot_script_after.sh # this might get merged into remaster_generic_inner_chroot_script_after.sh
# once the Gaming Edition will be rebased on top of SpinBase, now it's based # once the Gaming Edition will be rebased on top of SpinBase, now it's based

3
scripts/remaster_generic_inner_chroot_script.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
# make sure there is no stale pid file around that prevents entropy from running # make sure there is no stale pid file around that prevents entropy from running
rm -f /var/run/entropy/entropy.lock rm -f /var/run/entropy/entropy.lock

1
scripts/remaster_generic_inner_chroot_script_after.sh
View File

@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
# do not remove these
/usr/sbin/env-update /usr/sbin/env-update
. /etc/profile . /etc/profile

3
scripts/remaster_serverbase_inner_chroot_script_after.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
/usr/sbin/env-update
. /etc/profile
rc-update del installer-gui boot rc-update del installer-gui boot
rc-update del x-setup boot rc-update del x-setup boot
rc-update del hald boot rc-update del hald boot