Skip to content

Commit

Permalink
v104
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fourdee
Fourdee committed Dec 16, 2015
1 parent 7d44184 commit 96f0142
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 69 deletions.
0 dietpi/.auto_boot_index → dietpi/.dietpi-autostart_index
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions dietpi/dietpi-autostart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@
#/////////////////////////////////////////////////////////////////////////////////////
# MENUS
#/////////////////////////////////////////////////////////////////////////////////////
WHIP_BACKTITLE='DietPi AutoBoot'
WHIP_BACKTITLE='DietPi AutoStart'
WHIP_TITLE='------- DietPi - AutoStart -------'
CHOICE=0
OPTION=0
TARGETMENUID=0

AUTO_BOOT_INDEX=0
AUTO_START_INDEX=0

Apply_Boot_Index(){

#Save boot index.
echo -e "$AUTO_BOOT_INDEX" > /DietPi/dietpi/.auto_boot_index
echo -e "$AUTO_START_INDEX" > /DietPi/dietpi/.dietpi-autostart_index

#Enable auto login
if (( $AUTO_BOOT_INDEX > 0 )); then
if (( $AUTO_START_INDEX > 0 )); then

#Deb wheezy
if (( $DISTRO == 1 )); then
Expand Down Expand Up @@ -77,7 +77,7 @@ _EOF_
Menu_Main(){

#existing boot flag
AUTO_BOOT_INDEX=$(cat /DietPi/dietpi/.auto_boot_index)
AUTO_START_INDEX=$(cat /DietPi/dietpi/.dietpi-autostart_index)

local -a option_name=(
"0" "Console: Manual Login (default)"
Expand All @@ -90,15 +90,15 @@ _EOF_
"5" "DietPi-Cloudshell"
)

OPTION=$(whiptail --title "$WHIP_TITLE" --menu "Current AutoBoot Option: $AUTO_BOOT_INDEX\n\nNB: If your choice is not Console:, please ensure your choice is also installed (or selected for install) in dietpi-software." --cancel-button "Back" --backtitle "$WHIP_BACKTITLE" --default-item "$AUTO_BOOT_INDEX" 17 70 6 "${option_name[@]}" 3>&1 1>&2 2>&3)
OPTION=$(whiptail --title "$WHIP_TITLE" --menu "Current AutoBoot Option: $AUTO_START_INDEX\n\nNB: If your choice is not Console:, please ensure your choice is also installed (or selected for install) in dietpi-software." --cancel-button "Back" --backtitle "$WHIP_BACKTITLE" --default-item "$AUTO_START_INDEX" 17 70 6 "${option_name[@]}" 3>&1 1>&2 2>&3)
CHOICE=$?

unset option_name

if (( $CHOICE == 0 )); then

#Apply Selected boot option
AUTO_BOOT_INDEX=$OPTION
AUTO_START_INDEX=$OPTION

Apply_Boot_Index

Expand Down Expand Up @@ -129,7 +129,7 @@ _EOF_
#Apply boot index
elif (( $INPUT >= 0 )); then

AUTO_BOOT_INDEX=$INPUT
AUTO_START_INDEX=$INPUT
Apply_Boot_Index

fi
Expand Down
2 changes: 1 addition & 1 deletion dietpi/dietpi-survey
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
echo -e "Hardware Index : $(sed -n 1p /DietPi/dietpi/.hw_model)" >> "$SOURCE_FILENAME"
echo -e "Hardware Name : $(sed -n 2p /DietPi/dietpi/.hw_model)" >> "$SOURCE_FILENAME"
echo -e "Distro Index : $(sed -n 3p /DietPi/dietpi/.hw_model)" >> "$SOURCE_FILENAME"
echo -e "Autoboot Index : $(cat /DietPi/dietpi/.auto_boot_index)" >> "$SOURCE_FILENAME"
echo -e "Autoboot Index : $(cat /DietPi/dietpi/.dietpi-autostart_index)" >> "$SOURCE_FILENAME"
echo -e "Country : $(curl --max-time 4 -s http://whatismycountry.com/ | sed -n 's|.*,\(.*\)</h3>|\1|p')" >> "$SOURCE_FILENAME"
echo -e "Hostname : $(cat /etc/hostname)" >> "$SOURCE_FILENAME"
echo -e "\n" >> "$SOURCE_FILENAME"
Expand Down
88 changes: 44 additions & 44 deletions dietpi/finalise
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,70 +145,70 @@
#////////////////////////////////////
# Set dietpi.txt back to normal
#Network
sed -i '/Ethernet_Enabled=/c\Ethernet_Enabled=1' /DietPi/dietpi.txt
sed -i '/Wifi_Enabled=/c\Wifi_Enabled=0' /DietPi/dietpi.txt
sed -i '/Wifi_SSID=/c\Wifi_SSID=FuzonWifi' /DietPi/dietpi.txt
sed -i '/Wifi_KEY=/c\Wifi_KEY=MyAccessKey' /DietPi/dietpi.txt
sed -i '/Use_Static=/c\Use_Static=0' /DietPi/dietpi.txt
sed -i '/Static_IP=/c\Static_IP=192.168.0.100' /DietPi/dietpi.txt
sed -i '/Static_Mask=/c\Static_Mask=255.255.255.0' /DietPi/dietpi.txt
sed -i '/Static_Gateway=/c\Static_Gateway=192.168.0.1' /DietPi/dietpi.txt
sed -i '/Static_DNS=/c\Static_DNS=8.8.8.8' /DietPi/dietpi.txt
sed -i '/^Ethernet_Enabled=/c\Ethernet_Enabled=1' /DietPi/dietpi.txt
sed -i '/^Wifi_Enabled=/c\Wifi_Enabled=0' /DietPi/dietpi.txt
sed -i '/^Wifi_SSID=/c\Wifi_SSID=FuzonWifi' /DietPi/dietpi.txt
sed -i '/^Wifi_KEY=/c\Wifi_KEY=MyAccessKey' /DietPi/dietpi.txt
sed -i '/^Use_Static=/c\Use_Static=0' /DietPi/dietpi.txt
sed -i '/^Static_IP=/c\Static_IP=192.168.0.100' /DietPi/dietpi.txt
sed -i '/^Static_Mask=/c\Static_Mask=255.255.255.0' /DietPi/dietpi.txt
sed -i '/^Static_Gateway=/c\Static_Gateway=192.168.0.1' /DietPi/dietpi.txt
sed -i '/^Static_DNS=/c\Static_DNS=8.8.8.8' /DietPi/dietpi.txt

#DietPi-Automation
rm /root/DietPi-Automation.log
sed -i "/AUTO_AutoLogin=/c\AUTO_AutoLogin=0" /DietPi/dietpi.txt
sed -i "/AUTO_Install_Index=/c\AUTO_Install_Index=0" /DietPi/dietpi.txt
sed -i "/^AUTO_AutoLogin=/c\AUTO_AutoLogin=0" /DietPi/dietpi.txt
sed -i "/^AUTO_Install_Index=/c\AUTO_Install_Index=0" /DietPi/dietpi.txt

sed -i "/AUTO_SkipLicensePrompt=/c\AUTO_SkipLicensePrompt=0" /DietPi/dietpi.txt
sed -i "/AUTO_DietpiSoftware_SkipUpdateRebootPrompt=/c\AUTO_DietpiSoftware_SkipUpdateRebootPrompt=0" /DietPi/dietpi.txt
sed -i "/AUTO_DietpiSoftware_SkipQuestions=/c\AUTO_DietpiSoftware_SkipQuestions=0" /DietPi/dietpi.txt
sed -i "/AUTO_DietpiSoftware_SkipUsbDrive=/c\AUTO_DietpiSoftware_SkipUsbDrive=0" /DietPi/dietpi.txt
sed -i "/AUTO_DietpiSoftware_IgnoreErrors=/c\AUTO_DietpiSoftware_IgnoreErrors=0" /DietPi/dietpi.txt
sed -i "/^AUTO_SkipLicensePrompt=/c\AUTO_SkipLicensePrompt=0" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_SkipUpdateRebootPrompt=/c\AUTO_DietpiSoftware_SkipUpdateRebootPrompt=0" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_SkipQuestions=/c\AUTO_DietpiSoftware_SkipQuestions=0" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_SkipUsbDrive=/c\AUTO_DietpiSoftware_SkipUsbDrive=0" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_IgnoreErrors=/c\AUTO_DietpiSoftware_IgnoreErrors=0" /DietPi/dietpi.txt

sed -i "/AUTO_DietpiSoftware_SSHServerIndex=/c\AUTO_DietpiSoftware_SSHServerIndex=-1" /DietPi/dietpi.txt
sed -i "/AUTO_DietpiSoftware_FileServerIndex=/c\AUTO_DietpiSoftware_FileServerIndex=0" /DietPi/dietpi.txt
sed -i "/AUTO_DietpiSoftware_LoggingIndex=/c\AUTO_DietpiSoftware_LoggingIndex=-1" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_SSHServerIndex=/c\AUTO_DietpiSoftware_SSHServerIndex=-1" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_FileServerIndex=/c\AUTO_DietpiSoftware_FileServerIndex=0" /DietPi/dietpi.txt
sed -i "/^AUTO_DietpiSoftware_LoggingIndex=/c\AUTO_DietpiSoftware_LoggingIndex=-1" /DietPi/dietpi.txt

sed -i "/AUTO_AutoStartTarget=/c\AUTO_AutoStartTarget=0" /DietPi/dietpi.txt
sed -i "/^AUTO_AutoStartTarget=/c\AUTO_AutoStartTarget=0" /DietPi/dietpi.txt

sed -i "/AUTO_Timezone=/c\AUTO_Timezone=Europe/London" /DietPi/dietpi.txt
sed -i "/AUTO_Locale=/c\AUTO_Locale=en_GB" /DietPi/dietpi.txt
sed -i "/AUTO_KeyboardLayout=/c\AUTO_KeyboardLayout=gb" /DietPi/dietpi.txt
sed -i "/^AUTO_Timezone=/c\AUTO_Timezone=Europe/London" /DietPi/dietpi.txt
sed -i "/^AUTO_Locale=/c\AUTO_Locale=en_GB" /DietPi/dietpi.txt
sed -i "/^AUTO_KeyboardLayout=/c\AUTO_KeyboardLayout=gb" /DietPi/dietpi.txt

sed -i "/AUTO_CustomScriptURL=/c\AUTO_CustomScriptURL=0" /DietPi/dietpi.txt
sed -i "/^AUTO_CustomScriptURL=/c\AUTO_CustomScriptURL=0" /DietPi/dietpi.txt

# Development Settings
sed -i "/gitbranch=/c\gitbranch=master" /DietPi/dietpi.txt
sed -i "/^gitbranch=/c\gitbranch=master" /DietPi/dietpi.txt

#DietPi-Config specific
sed -i "/rpi_hdmi_output=/c\rpi_hdmi_output=1" /DietPi/dietpi.txt
sed -i "/^rpi_hdmi_output=/c\rpi_hdmi_output=1" /DietPi/dietpi.txt

if (( $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors | grep -ci -m1 'ondemand') == 1 )); then
sed -i "/cpu_governor=/c\cpu_governor=ondemand" /DietPi/dietpi.txt
sed -i "/^cpu_governor=/c\cpu_governor=ondemand" /DietPi/dietpi.txt
elif (( $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors | grep -ci -m1 'interactive') == 1 )); then
sed -i "/cpu_governor=/c\cpu_governor=interactive" /DietPi/dietpi.txt
sed -i "/^cpu_governor=/c\cpu_governor=interactive" /DietPi/dietpi.txt
else
sed -i "/cpu_governor=/c\cpu_governor=performance" /DietPi/dietpi.txt
sed -i "/^cpu_governor=/c\cpu_governor=performance" /DietPi/dietpi.txt
fi

sed -i '/cpu_usage_throttle_up=/c\cpu_usage_throttle_up=50' /DietPi/dietpi.txt
sed -i '/cpu_max_frequency=/c\cpu_max_frequency=0' /DietPi/dietpi.txt
sed -i '/^cpu_usage_throttle_up=/c\cpu_usage_throttle_up=50' /DietPi/dietpi.txt
sed -i '/^cpu_max_frequency=/c\cpu_max_frequency=0' /DietPi/dietpi.txt

sed -i "/cpu_ondemand_sampling_rate=/c\cpu_ondemand_sampling_rate=100000" /DietPi/dietpi.txt
sed -i "/cpu_ondemand_sampling_down_factor=/c\cpu_ondemand_sampling_down_factor=20" /DietPi/dietpi.txt
sed -i "/^cpu_ondemand_sampling_rate=/c\cpu_ondemand_sampling_rate=100000" /DietPi/dietpi.txt
sed -i "/^cpu_ondemand_sampling_down_factor=/c\cpu_ondemand_sampling_down_factor=20" /DietPi/dietpi.txt

sed -i '/SambaClient_ComputerName=/c\SambaClient_ComputerName=computername' /DietPi/dietpi.txt
sed -i '/SambaClient_ShareName=/c\SambaClient_ShareName=sharename' /DietPi/dietpi.txt
sed -i '/SambaClient_Username=/c\SambaClient_Username=username' /DietPi/dietpi.txt
sed -i '/SambaClient_Password=/c\SambaClient_Password=password' /DietPi/dietpi.txt
sed -i '/^SambaClient_ComputerName=/c\SambaClient_ComputerName=computername' /DietPi/dietpi.txt
sed -i '/^SambaClient_ShareName=/c\SambaClient_ShareName=sharename' /DietPi/dietpi.txt
sed -i '/^SambaClient_Username=/c\SambaClient_Username=username' /DietPi/dietpi.txt
sed -i '/^SambaClient_Password=/c\SambaClient_Password=password' /DietPi/dietpi.txt

sed -i '/curlftpfs_clientaddress=/c\curlftpfs_clientaddress=192.168.0.100' /DietPi/dietpi.txt
sed -i '/curlftpfs_clientusername=/c\curlftpfs_clientusername=username' /DietPi/dietpi.txt
sed -i '/curlftpfs_clientpassword=/c\curlftpfs_clientpassword=password' /DietPi/dietpi.txt
sed -i '/^curlftpfs_clientaddress=/c\curlftpfs_clientaddress=192.168.0.100' /DietPi/dietpi.txt
sed -i '/^curlftpfs_clientusername=/c\curlftpfs_clientusername=username' /DietPi/dietpi.txt
sed -i '/^curlftpfs_clientpassword=/c\curlftpfs_clientpassword=password' /DietPi/dietpi.txt

sed -i '/dietpi_check_for_updates=/c\dietpi_check_for_updates=1' /DietPi/dietpi.txt
sed -i '/ntpd_update_mode=/c\ntpd_update_mode=2' /DietPi/dietpi.txt
sed -i '/^dietpi_check_for_updates=/c\dietpi_check_for_updates=1' /DietPi/dietpi.txt
sed -i '/^ntpd_update_mode=/c\ntpd_update_mode=2' /DietPi/dietpi.txt

/DietPi/dietpi/dietpi-cpu_set

Expand Down Expand Up @@ -238,8 +238,8 @@
rm -R /mnt/dietpi-backup
rm -R /mnt/dietpi-sync

#.auto_boot_index Console
echo 0 > /DietPi/dietpi/.auto_boot_index
#.dietpi-autostart_index Console
echo 0 > /DietPi/dietpi/.dietpi-autostart_index

#Create our update file (used on 1st run to check for DietPi updates)
echo -1 > /DietPi/dietpi/.update_stage
Expand Down
23 changes: 11 additions & 12 deletions dietpi/login
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
DIETPI_VERSION=$(cat /DietPi/dietpi/.version)

#/////////////////////////////////////////////////////////////////////////////////////
#AutoBoot
#DietPi-Autostart
#/////////////////////////////////////////////////////////////////////////////////////
# 0=console / 1=kodi-standalone / 2=startx lxde / 3=emulationstation
AUTO_BOOT_INDEX=$(cat /DietPi/dietpi/.auto_boot_index)
AUTO_START_INDEX=$(cat /DietPi/dietpi/.dietpi-autostart_index)

#Autoboot
Run_AutoBoot(){
Run_AutoStart(){

#Do we have a valid screen for autoboot?
local screen_valid=0
Expand All @@ -67,24 +67,24 @@
if (( $screen_valid == 1 )); then

#Kodi
if (( $AUTO_BOOT_INDEX == 1 )); then
if (( $AUTO_START_INDEX == 1 )); then
/DietPi/dietpi/misc/start_kodi

#LXDE - Desktop
elif (( $AUTO_BOOT_INDEX == 2 )); then
elif (( $AUTO_START_INDEX == 2 )); then
startx

#RetroPie/Emulation station
elif (( $AUTO_BOOT_INDEX == 3 )); then
elif (( $AUTO_START_INDEX == 3 )); then
#emulationstation - can no longer be run as root
/opt/retropie/supplementary/emulationstation/emulationstation

#OpenTyrian
elif (( $AUTO_BOOT_INDEX == 4 )); then
elif (( $AUTO_START_INDEX == 4 )); then
/usr/local/games/opentyrian/run

#DietPi-Cloudshell
elif (( $AUTO_BOOT_INDEX == 5 )); then
elif (( $AUTO_START_INDEX == 5 )); then
#prevent sleep
setterm -blank 0 -powersave off &> /dev/tty1

Expand All @@ -100,7 +100,7 @@
/DietPi/dietpi/dietpi-cloudshell 1 &

#LXDE - VNC Server
elif (( $AUTO_BOOT_INDEX == 6 )); then
elif (( $AUTO_START_INDEX == 6 )); then

res_x=1280
res_y=720
Expand Down Expand Up @@ -136,9 +136,8 @@

/DietPi/dietpi/dietpi-banner 1

#Autoboot
if (( $AUTO_BOOT_INDEX > 0 )); then
Run_AutoBoot
if (( $AUTO_START_INDEX > 0 )); then
Run_AutoStart
fi

#----------------------------------------------------------------
Expand Down
7 changes: 3 additions & 4 deletions dietpi/patch_file
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,13 @@
echo -e "103 > 104 patch"
#-------------------------------------------------------------------------------
# New automation options > dietpi.txt
if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^AUTO_CustomScriptURL=') == 0 )); then
sed -i "/# >> Automation Options/a #Downloads and executes a custom script during 1st run setup. eg: http://myweb.com/script.sh | 0=disabled\nAUTO_CustomScriptURL=0" /DietPi/dietpi.txt
fi

if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^AUTO_AutoLogin=') == 0 )); then
sed -i "/# >> Automation Options/a #Automatically logs the root user in to start 1st run setup.\nAUTO_AutoLogin=0" /DietPi/dietpi.txt
fi
#-------------------------------------------------------------------------------
#FP name change for autoboot (now DietPi-Autostart)
mv /DietPi/dietpi/.auto_boot_index /DietPi/dietpi/.dietpi-autostart_index
#-------------------------------------------------------------------------------
#DietPi-Cloudshell - 'c / 'f option
if [ -f /DietPi/dietpi/.dietpi-cloudshell ]; then
sed -i '4s/.*/1/' /DietPi/dietpi/.dietpi-cloudshell
Expand Down

0 comments on commit 96f0142

Please sign in to comment.