From abdceefb1533e6139bf2ac6cb8c218bdef2a5b88 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Wed, 27 Jun 2012 03:28:05 +0200 Subject: [PATCH] .xinitrc: Made overclocking warning more generic --- recipes/pandora-system/pandora-skel.bb | 2 +- recipes/pandora-system/pandora-skel/.xinitrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/pandora-system/pandora-skel.bb b/recipes/pandora-system/pandora-skel.bb index 1155032..ae6f37b 100644 --- a/recipes/pandora-system/pandora-skel.bb +++ b/recipes/pandora-system/pandora-skel.bb @@ -5,7 +5,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" # /etc/skel is used by Shadow's useradd so you really have that installed for this to make sense ;) RDEPENDS = "shadow" -PR = "r17" +PR = "r18" SRC_URI = " \ file://.xinitrc \ diff --git a/recipes/pandora-system/pandora-skel/.xinitrc b/recipes/pandora-system/pandora-skel/.xinitrc index f22c628..d4a9e5b 100644 --- a/recipes/pandora-system/pandora-skel/.xinitrc +++ b/recipes/pandora-system/pandora-skel/.xinitrc @@ -90,7 +90,7 @@ nocleanwarn=$(cat /tmp/nocleanwarn) if [ $nocleanwarn = "Yes" ]; then defmhz="$(cat /etc/pandora/conf/cpu.conf | grep default | awk -F\: '{print $2}')" if [ $defmhz -gt 600 ]; then - if zenity --question --title="Unclean Shutdown" --text="Warning!\n\nThe system has not been shutdown properly last time.\n\nAs you overclocked the CPU as default speed, this might be the reason for that.\nTherefore CPU speed has been currently set to 600 MHz.\n\nShould it be set to your default speed ($defmhz MHz) or shall we keep the 600 MHz for this session?" --ok-label="Set it to $defmhz MHz" --cancel-label="Keep 500MHz"; then + if zenity --question --title="Unclean Shutdown" --text="Warning!\n\nThe system has not been shutdown properly last time.\n\nAs you overclocked the CPU as default speed, this might be the reason for that.\nTherefore CPU speed has been currently set to the standard CPU speed of your SoC.\n\nShould it be set to your default speed ($defmhz MHz) or shall we keep safe setting for this session?" --ok-label="Set it to $defmhz MHz" --cancel-label="Leave it safe..."; then sudo /usr/pandora/scripts/op_cpuspeed.sh $defmhz fi fi -- 2.39.2